From 6bfbf5bd2bee976219c57d9eb1f369ad2baeaa40 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 18 Nov 2014 16:13:11 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=8C=BF=E8=AF=84=E9=98=B6?=
 =?UTF-8?q?=E6=AE=B5=E8=AF=BE=E7=A8=8B=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=B8=8D=E5=8F=AF=E6=8F=90=E4=BA=A4=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=202.=E5=A2=9E=E5=8A=A0=E5=8C=BF=E8=AF=84=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E9=98=B6=E6=AE=B5=E5=8F=AF=E6=8F=90=E4=BA=A4=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/bids/_bid_homework_show.html.erb         | 8 +++++++-
 app/views/homework_attach/_homeworks_list.html.erb | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb
index 166a4b224..cd9b7b037 100644
--- a/app/views/bids/_bid_homework_show.html.erb
+++ b/app/views/bids/_bid_homework_show.html.erb
@@ -45,7 +45,13 @@
                   <% if User.current.logged? && is_cur_course_student(@course) %>
                      <% cur_user_homework = cur_user_homework_for_bid(bid) %>
                       <% if cur_user_homework!= nil && cur_user_homework.empty? %>
-                          <%= link_to l(:label_commit_homework),new_exercise_book_path(bid)  %>
+                          <% if bid.comment_status == 0 || bid.comment_status == 2%>
+                            <%= link_to l(:label_commit_homework),new_exercise_book_path(bid)  %>
+                          <% else %>
+                            <span title="匿评阶段不可提交作业！">
+                              <%= l(:label_commit_homework)%>
+                            </span>
+                          <% end %>
                       <% else %>
                           <span style="color: green; float: right">
                             <%= l(:lable_has_commit_homework)%>
diff --git a/app/views/homework_attach/_homeworks_list.html.erb b/app/views/homework_attach/_homeworks_list.html.erb
index c778588f7..c40004d02 100644
--- a/app/views/homework_attach/_homeworks_list.html.erb
+++ b/app/views/homework_attach/_homeworks_list.html.erb
@@ -35,13 +35,13 @@
             </span>
           </li>
           <li class="c_red" style="margin:25px 0 0 20px;"> 您还没交作业，请创建作业！</li>
-          <% if @bid.comment_status == 0 %>
+          <% if @bid.comment_status == 0 ||  @bid.comment_status == 1%>
               <!-- 老师布置的作业在创建和开启匿评这段时间才允许创建作品 -->
               <li class="wping">
                 <%= link_to "提交作业", new_exercise_book_path(@bid), :style => "width:80px; margin:20px 0 0 350px;" %>
               </li>
           <% else %>
-              <li class="wping" title="只有开启匿评之前才能创建作业哦！">
+              <li class="wping" title="匿评阶段不可提交作业！">
                 <a style="width:80px; margin:20px 0 0 350px;background:#8e8e8e;">提交作业</a>
               </li>
           <% end %>