From 55297a9dafdcc61af10de9dfd46e261dbf3f1cfb Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 3 May 2016 15:19:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BD=9C=E4=B8=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E4=B8=AD=E9=A1=B9=E7=9B=AE=E7=9A=84=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=8Etip=E4=B8=AD=E7=9A=84=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/_org_course_homework.html.erb | 2 +-
 app/views/users/_course_homework.html.erb             | 2 +-
 app/views/users/_user_homework_detail.html.erb        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index 4ac2ebcbf..64c032518 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@@ -211,7 +211,7 @@
                     <div class="relatePInfo" id="relatePInfo_<%=project.id %>_<%=activity.id %>">
                       项目名称：<%=project.name %><br />
                       创建者：<%=(User.find project.user_id).show_name %>(组长)<br />
-                      更新时间：<%=time_from_now time %>
+                      更新时间：<%=time_from_now !com_time.nil? && format_time(com_time) > format_time(time) ? com_time : time %>
                     </div>
                   </div>
                   <% if i == 9 && projects.count > 10 %>
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 2a4704c24..c48b23667 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -220,7 +220,7 @@
                 <div class="relatePInfo" id="relatePInfo_<%=project.id %>_<%=activity.id %>">
                   项目名称：<%=project.name %><br />
                   创建者：<%=(User.find project.user_id).show_name %>(组长)<br />
-                  更新时间：<%=time_from_now time %>
+                  更新时间：<%=time_from_now !com_time.nil? && format_time(com_time) > format_time(time) ? com_time : time %>
                 </div>
               </div>
               <% if i == 9 && projects.count > 10 %>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 7af8ada43..7402cee9f 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -225,7 +225,7 @@
                     <div class="relatePInfo" id="relatePInfo_<%=project.id %>_<%=homework_common.id %>">
                       项目名称：<%=project.name %><br />
                       创建者：<%=(User.find project.user_id).show_name %>(组长)<br />
-                      更新时间：<%=time_from_now time %>
+                      更新时间：<%=time_from_now !com_time.nil? && format_time(com_time) > format_time(time) ? com_time : time %>
                     </div>
                   </div>
                   <% if i == 9 && projects.count > 10 %>