统一作业动态中项目的更新时间与tip中的更新时间

9 years ago · 55297a9daf
parent c49627913b
commit 55297a9daf
3 changed files with 3 additions and 3 deletions
--- 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 %>
--- 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 %>
--- 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 %>