From f560e9f494c2c0b733d4cfddfdda74b77bb6458b Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 19 Nov 2014 11:11:28 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=9C=AA=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E5=8C=BF=E8=AF=84=E5=AD=A6=E7=94=9F=E7=95=8C=E9=9D=A2=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=8C=BF=E8=AF=84=E5=88=97=E8=A1=A8=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=202.=E4=BF=AE=E6=94=B9=E6=9C=AA=E5=BC=80?=
 =?UTF-8?q?=E5=90=AF=E5=8C=BF=E8=AF=84=E5=AD=A6=E7=94=9F=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E4=BC=97=E8=AF=84=E7=82=B9=E8=B5=9E=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/bids/_homework.html.erb      |  4 ++--
 app/views/bids/_homework_list.html.erb | 13 ++++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/views/bids/_homework.html.erb b/app/views/bids/_homework.html.erb
index 078ca8000..7cde4f31d 100644
--- a/app/views/bids/_homework.html.erb
+++ b/app/views/bids/_homework.html.erb
@@ -43,9 +43,9 @@
                 <% end %>
 
                 <% unless @is_teacher%>
-                    <% if @bid.comment_status == 0%>
+                    <% if @bid.comment_status == 0 && @bid.open_anonymous_evaluation == 1%>
                         $("#my_homework").click();
-                    <% elsif @bid.comment_status == 2%>
+                    <% elsif @bid.comment_status == 2 || @bid.open_anonymous_evaluation == 0%>
                         $("#all_homeworks").click();
                     <% end %>
                 <% end %>
diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb
index acbcbc2fa..036289b0a 100644
--- a/app/views/bids/_homework_list.html.erb
+++ b/app/views/bids/_homework_list.html.erb
@@ -28,14 +28,17 @@
       </ul>
   <% else %>
       <ul>
-        <li id="tb_5" class="hovertab">
-          <%= link_to @bid.comment_status == 2 ? "已评作品" : "待评作品", get_student_batch_homework_homework_attach_index_path(:bid_id => @bid.id), {id: 'student_batch_homework',:remote => true}%>
-        </li>
+        <% if @bid.open_anonymous_evaluation == 1%>
+            <li id="tb_5" class="hovertab">
+              <!-- 开启了匿评才能看到匿评列表 -->
+                  <%= link_to @bid.comment_status == 2 ? "已评作品" : "待评作品", get_student_batch_homework_homework_attach_index_path(:bid_id => @bid.id), {id: 'student_batch_homework',:remote => true}%>
+            </li>
+        <% end %>
         <li id="tb_6" class="normaltab">
           <%= link_to "我的作品", get_my_homework_homework_attach_index_path(:bid_id => @bid.id), {id: 'my_homework',:remote => true}%>
         </li>
-        <% if @bid.comment_status == 2 %>
-            <!-- 匿评结束后才能看到全部作业列表 -->
+        <% if @bid.comment_status == 2 || @bid.open_anonymous_evaluation == 0%>
+            <!-- 匿评结束后或者未开启匿评才能看到全部作业列表 -->
             <li id="tb_7" class="normaltab">
               <%= link_to "所有作品", get_homeworks_homework_attach_index_path(:bid_id => @bid.id), {id: 'all_homeworks',:remote => true}%>
             </li>