From f6034b56f0e6f1eaf3a97f79a7c421be608f1b81 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 24 Nov 2016 09:53:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=9A=84=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E4=B8=80=E7=9B=B4=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_homework_post_brief.html.erb | 4 +---
 app/views/users/_course_homework.html.erb            | 6 ++----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/views/student_work/_homework_post_brief.html.erb b/app/views/student_work/_homework_post_brief.html.erb
index 868caae96..d2041bfbb 100644
--- a/app/views/student_work/_homework_post_brief.html.erb
+++ b/app/views/student_work/_homework_post_brief.html.erb
@@ -31,10 +31,8 @@
         <%= l(:label_publish_time)%>：<%= homework.publish_time%>&nbsp;00:00
       </div>
   <% end %>
-  <% if homework.homework_detail_manual && homework.homework_detail_manual.comment_status < 2 %>
+  <% if !homework.end_time.nil? %>
       <div class="homepagePostDeadline ml15 <%= (is_pro || is_base_group) ? 'mt8' : '' %>">提交截止时间：<%= homework.end_time.to_s %>&nbsp;23:59</div>
-  <% elsif homework.homework_detail_manual && homework.homework_detail_manual.comment_status >= 2 && homework.anonymous_comment == 0%>
-      <div class="homepagePostDeadline ml15 <%= (is_pro || is_base_group) ? 'mt8' : '' %>">匿评截止时间：<%= homework.homework_detail_manual.evaluation_end.to_s %>&nbsp;23:59</div>
   <% end %>
   <div class="cl"></div>
 </div>
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index b120c8afc..9ec5af7e2 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -33,10 +33,8 @@
       <% end %>
       <div class="homepagePostSubmitContainer">
         <%= render :partial => 'users/homework_opr', :locals => {:activity => activity, :is_teacher => is_teacher, :hw_status => hw_status, :user_activity_id => user_activity_id} %>
-        <% if activity.homework_detail_manual && activity.homework_detail_manual.comment_status < 2 %>
-            <div class="homepagePostDeadline">提交截止时间：<%= activity.end_time.to_s %>&nbsp;23:59</div>
-        <% elsif activity.homework_detail_manual && activity.homework_detail_manual.comment_status >= 2 && activity.anonymous_comment == 0%>
-            <div class="homepagePostDeadline">匿评截止时间：<%= activity.homework_detail_manual.evaluation_end.to_s %>&nbsp;23:59</div>
+        <% if !activity.end_time.nil? %>
+        <div class="homepagePostDeadline">提交截止时间：<%= activity.end_time.to_s %>&nbsp;23:59</div>
         <% end %>
         <% if activity.homework_detail_manual.comment_status == 0  && !activity.publish_time.nil? %>
             <div class="homepagePostDeadline ml15">