From fd426936bb372a768f33e16a06b764265ccc07e5 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Sat, 15 Feb 2014 16:34:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=B6=E9=97=B4=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E9=94=99=E8=AF=AF=E5=BC=95=E5=8F=91=E7=9A=84=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb |  4 +---
 app/models/course.rb                | 10 ++++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 00c7d9557..5db2d0cf5 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -177,9 +177,7 @@ class UsersController < ApplicationController
     @memberships_done  = []
     now_time = Time.now
     @memberships.map { |e|
-      (@memberships_doing.push(e);next) if e.project.course_extra.endup_time.nil?
-      end_time_str = e.project.course_extra.endup_time
-      end_time = Time.parse(end_time_str)
+      end_time = e.project.course_extra.get_endup_time
       if end_time > now_time
         @memberships_doing.push e
       else
diff --git a/app/models/course.rb b/app/models/course.rb
index 155ad068f..9fff8713a 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -17,5 +17,15 @@ class Course < ActiveRecord::Base
   'term',
   'password'
  
+  def get_endup_time
+    begin
+      end_time = Time.parse(self.endup_time)
+    rescue Exception => e
+      end_time = Time.parse("3000-01-01")
+      Rails.logger.error "[Error] course endup_time error. ===> #{e}"
+    ensure 
+      return end_time
+    end
+  end
 
 end