From 484d334c3cfeed06bb3fe303f469e9bb7e821e8e Mon Sep 17 00:00:00 2001 From: wanglinchun Date: Tue, 15 Apr 2014 10:34:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AB=9E=E8=B5=9B=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=B8=AD=E5=8F=82=E8=B5=9B=E9=A1=B9=E7=9B=AE=E7=9A=84?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/contests_controller.rb | 23 +++++++++++-------- app/views/contests/_list_projects.html.erb | 1 + .../contests/_list_softapplications.html.erb | 1 + .../contests/_softapplication_list.html.erb | 2 +- app/views/contests/show_project.html.erb | 1 + app/views/softapplications/show.html.erb | 2 +- app/views/tags/_sidebar_tags.html.erb | 1 + app/views/tags/_tag.html.erb | 1 + 8 files changed, 21 insertions(+), 11 deletions(-) diff --git a/app/controllers/contests_controller.rb b/app/controllers/contests_controller.rb index ccc5c51ab..86c4df367 100644 --- a/app/controllers/contests_controller.rb +++ b/app/controllers/contests_controller.rb @@ -190,6 +190,8 @@ class ContestsController < ApplicationController def show_project @membership = User.current.memberships.all(:conditions => Project.visible_condition(User.current)) @option = [] + # @contesting_project_count = @contesting_project_all.count + # @contesting_project_pages = Paginator.new @contesting_project_count, per_page_option, params['page'] @membership.each do |membership| unless(membership.project.project_type==1) membership.member_roles.each{|role| @@ -214,17 +216,18 @@ class ContestsController < ApplicationController @contesting_project = @temp else - @temp = [] - @contesting_project.each do |pro| - if pro.project && pro.project.project_status - @temp << pro + @temp = [] + @contesting_project.each do |pro| + if pro.project && pro.project.project_status + @temp << pro + end + @temp + end + if @temp.size > 0 + @contesting_project = @temp.sort {|a,b| b.project.project_status.grade <=> a.project.project_status.grade} end - @temp - end - if @temp.size > 0 - @contesting_project = @temp.sort {|a,b| b.project.project_status.grade <=> a.project.project_status.grade} - end end + @contesting_project = paginateHelper @contesting_project respond_to do |format| format.html { render :layout => 'base_newcontest' @@ -241,6 +244,8 @@ class ContestsController < ApplicationController # @user = @contest.user @softapplication = Softapplication.all @contesting_softapplication = @contest.contesting_softapplications + + @contesting_softapplication = paginateHelper @contesting_softapplication, 10 # @temp = [] # @softapplicationt.each do |pro| diff --git a/app/views/contests/_list_projects.html.erb b/app/views/contests/_list_projects.html.erb index 6a778819d..48a5ed328 100644 --- a/app/views/contests/_list_projects.html.erb +++ b/app/views/contests/_list_projects.html.erb @@ -99,4 +99,5 @@ <% end %> <% end %> + diff --git a/app/views/contests/_list_softapplications.html.erb b/app/views/contests/_list_softapplications.html.erb index a0099c727..2c2034a5d 100644 --- a/app/views/contests/_list_softapplications.html.erb +++ b/app/views/contests/_list_softapplications.html.erb @@ -37,4 +37,5 @@ <% end %> <% end %> + diff --git a/app/views/contests/_softapplication_list.html.erb b/app/views/contests/_softapplication_list.html.erb index 570a40674..ee4b37921 100644 --- a/app/views/contests/_softapplication_list.html.erb +++ b/app/views/contests/_softapplication_list.html.erb @@ -2,7 +2,7 @@ <%= render_flash_messages %> - + <% if User.current.logged? %>
<%= l(:label_contest_softapplication) %>(<%= contesting_softapplication.count%>) <%= l(:label_contest_softapplication) %>(<%= @contest.contesting_softapplications.count%>)
diff --git a/app/views/contests/show_project.html.erb b/app/views/contests/show_project.html.erb index 07ddd6217..202d3b632 100644 --- a/app/views/contests/show_project.html.erb +++ b/app/views/contests/show_project.html.erb @@ -96,4 +96,5 @@
<%= render :partial => 'project_list', :locals => {:contesting_project => @contesting_project,:contest => @contest} %>
+ diff --git a/app/views/softapplications/show.html.erb b/app/views/softapplications/show.html.erb index 0d735abcd..f21d2cecb 100644 --- a/app/views/softapplications/show.html.erb +++ b/app/views/softapplications/show.html.erb @@ -60,7 +60,7 @@
-
软件评论：
 +
软件评论：
diff --git a/app/views/tags/_sidebar_tags.html.erb b/app/views/tags/_sidebar_tags.html.erb index a9570f609..cc377e6b4 100644 --- a/app/views/tags/_sidebar_tags.html.erb +++ b/app/views/tags/_sidebar_tags.html.erb @@ -9,4 +9,5 @@ (<%= Bid.tagged_with("#{sg}").size %>) <% when '5' then %> (<%= Forum.tagged_with("#{sg}").size %>) + <% end %> diff --git a/app/views/tags/_tag.html.erb b/app/views/tags/_tag.html.erb index 0d9467025..c38bdbaf5 100644 --- a/app/views/tags/_tag.html.erb +++ b/app/views/tags/_tag.html.erb @@ -6,6 +6,7 @@ 4 代表是bid类型 5 代表是forum类型 6 代表是Attachment类型 + #end%> <% if object_flag == '3' %>