From a4557d4d1927fc98c3ac64aa01f2136a495dbc80 Mon Sep 17 00:00:00 2001 From: Wen Date: Wed, 2 Apr 2014 17:34:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E7=BB=93=E6=9D=9F=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=AD=A3=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 5fcac2d59..2142b6603 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -165,6 +165,8 @@ class UsersController < ApplicationController end end + + include CoursesHelper def user_courses unless User.current.admin? @@ -186,10 +188,11 @@ class UsersController < ApplicationController now_time = Time.now.year @memberships.map { |e| end_time = e.project.course_extra.get_time.year - if end_time >= now_time - @memberships_doing.push e - else + isDone = course_endTime_timeout?(e.project) + if isDone @memberships_done.push e + else + @memberships_doing.push e end } # respond_to do |format|