|
|
|
@ -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|
|
|
|
|
|