diff --git a/app/controllers/contests_controller.rb b/app/controllers/contests_controller.rb index 75778631a..bb5b85a1a 100644 --- a/app/controllers/contests_controller.rb +++ b/app/controllers/contests_controller.rb @@ -292,17 +292,16 @@ class ContestsController < ApplicationController ###我要参赛 def show_attendingcontest - - - - + @softapplication = Softapplication.all + @contesting_softapplication = @contest.contesting_softapplications + @contesting_softapplication = paginateHelper @contesting_softapplication, 10 ##引用base_newcontest整体样式 - respond_to do |format| - format.html { - render :layout => 'base_newcontest' - } - format.api - + @contest = Contest.find_by_id(params[:id]) + respond_to do |format| + format.html { + render :layout => 'base_newcontest' + } + format.api end end diff --git a/app/views/contests/show_attendingcontest.html.erb b/app/views/contests/show_attendingcontest.html.erb index e69de29bb..993c63f28 100644 --- a/app/views/contests/show_attendingcontest.html.erb +++ b/app/views/contests/show_attendingcontest.html.erb @@ -0,0 +1,141 @@ + + + + + +
温馨提示：如果您希望在我们平台托管参赛数据和代码，请按下面参赛步骤参赛！
+<% if User.current.logged? %> + +
+
参赛步骤：
+
+ 步骤1： + <%= link_to '新建参赛作品', new_softapplication_path(:target=>'_blank'), :target=>'_blank' %> + （先点击“新建参赛作品”， 然后返回本页继续步骤2即可。） +
+
+ 步骤1： + <%= link_to '关联参赛作品', "javascript:void(0);", onclick: "$('#put-bid-form').toggle();" %> +
+
+ + + + +<% end %> + + + + +<% @contesting_softapplication.each do |c_softapplication|%> + <% if c_softapplication.softapplication %> +
+
+ + 应用软件: + + <%= link_to(c_softapplication.softapplication.name, softapplication_path(c_softapplication.softapplication), :target => '_blank') %> + +
+
+
+ + 简介: + + <%= c_softapplication.softapplication.description.truncate(90, omission: '...') %> + +
+
+
+ + 发布时间： + + <%=format_time c_softapplication.created_at %> + + + +
+
+ <% end %> +
+<% end %> + + + + diff --git a/lib/redmine.rb b/lib/redmine.rb index 583497841..3d3565430 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -281,7 +281,8 @@ Redmine::MenuManager.map :contest_menu do |menu| menu.push :respond, :show_contest_contest_path, :caption => :label_user_response menu.push :project, :show_project_contest_path, :caption => :label_contest_project menu.push :application, :show_softapplication_contest_path, :caption => :label_contest_application - menu.push :attendingcontest, :show_attendingcontest_contest_path, :caption => :label_attending_contest + menu.push :attendingcontest, {:controller => 'contests', :action => 'show_attendingcontest'}, :caption => :label_attending_contest + # menu.push :attendingcontest, :show_attendingcontest_contest_path, :caption => :label_attendin,g_contest # menu.push :result, { :controller => 'bids', :action => 'show_results' }, # :caption => :label_bidding_results,:if => Proc.new{ |p| User.current.id == p } end