From 24a9a5034c19897ffa7669e6c94c543cc0650d5f Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 24 Jul 2015 14:27:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E7=A8=8B=E4=BD=9C=E4=B8=9A=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=AF=BC=E5=87=BA=E9=99=84=E4=BB=B6=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/index.html.erb | 30 ++++++++++++++-------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index 781277b57..fc82aea1e 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -55,21 +55,23 @@
       <% end%>
       <% if @is_teacher%>
           <div class="fr">
-            <% if @homework.student_works.empty?%>
-                <%= link_to "附件", "javascript:void(0)", class: "down_btn fr zip_download_alert", :onclick => "alert('没有学生提交作业，无法下载附件')" %>
-            <% else%>
-                <%= link_to "附件", zipdown_assort_path(obj_class: @homework.class, obj_id: @homework, format: :json),
-                            remote: true, class: "down_btn fr zip_download_alert", :id => "download_homework_attachments" %>
+            <% unless @homework.homework_type == 2%>
+                <% if @homework.student_works.empty?%>
+                    <%= link_to "附件", "javascript:void(0)", class: "down_btn fr zip_download_alert", :onclick => "alert('没有学生提交作业，无法下载附件')" %>
+                <% else%>
+                    <%= link_to "附件", zipdown_assort_path(obj_class: @homework.class, obj_id: @homework, format: :json),
+                                remote: true, class: "down_btn fr zip_download_alert", :id => "download_homework_attachments" %>
+                <% end%>
+                <div class="info_ni_download" style="<%= @homework.homework_type == 1 ? '' : 'margin-left: 130px;'%>">
+                  使用
+                  <span class="c_red">winzip</span>
+                  工具进行解压可能会导致
+                  <span class="c_red">下载文件乱码</span>
+                  ，建议您使用
+                  <span class="c_red">winrar</span>
+                  工具进行解压
+                </div>
             <% end%>
-            <div class="info_ni_download" style="<%= @homework.homework_type == 1 ? '' : 'margin-left: 130px;'%>">
-              使用
-              <span class="c_red">winzip</span>
-              工具进行解压可能会导致
-              <span class="c_red">下载文件乱码</span>
-              ，建议您使用
-              <span class="c_red">winrar</span>
-              工具进行解压
-            </div>
             <%= link_to("匿评", evaluation_list_student_work_index_path(:homework => @homework.id, :format => 'xls'),:class=>'down_btn fr') if @homework.homework_type == 1%>
             <%= link_to("缺评", absence_penalty_list_student_work_index_path(:homework => @homework.id, :format => 'xls'),:class=>'down_btn fr') if @homework.homework_type == 1%>
             <%= link_to l(:label_list), student_work_index_path(:homework => @homework.id,:order => @order, :sort => @b_sort, :name => @name, :format => 'xls'),:class=>'down_btn fr'%>