From 4aa18ee1a1e642b328f5e596884aaec6195b54cc Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 28 May 2015 17:50:26 +0800
Subject: [PATCH] =?UTF-8?q?1=C2=B7=E3=80=81=20=E8=80=81=E5=B8=88=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E7=82=B9=E8=B5=9E=202=E3=80=81=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E5=9C=A8=E5=BC=80=E5=90=AF=E5=8C=BF=E8=AF=84=E3=80=81=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E5=8C=BF=E8=AF=84=E9=98=B6=E6=AE=B5=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=BC=96=E8=BE=91=E5=92=8C=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=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/_show.html.erb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/student_work/_show.html.erb b/app/views/student_work/_show.html.erb
index b9ebf3269..93f38cbac 100644
--- a/app/views/student_work/_show.html.erb
+++ b/app/views/student_work/_show.html.erb
@@ -6,7 +6,8 @@
     <%=format_time @work.created_at %>
   </li>
 
-  <% if @work.user == User.current %> <!-- 我的作业，显示编辑和删除按钮 -->
+  <% if !@is_teacher && @work.user == User.current && (@homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 1) %>
+      <!-- 我的作业 && (非匿评作业 || 为开启匿评)，显示编辑和删除按钮 -->
       <li class="fr" >
         <%= link_to("", student_work_path(@work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del")  %>
       </li>
@@ -14,7 +15,8 @@
         <%= link_to "",edit_student_work_path(@work),:class => "pic_edit"%>
       </li>
   <% end%>
-  <% if (@homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 3) && @work.user != User.current%> <!-- 普通作业或者编程作业，或者是匿评结束阶段，显示点赞按钮 -->
+  <% if (@homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 3) && @work.user != User.current%>
+      <!-- 普通作业或者编程作业，或者是匿评结束阶段，显示点赞按钮 -->
       <li class="fr" id="student_work_praise_<%= @homework.id%>">
         <%= render :partial => 'student_work_praise' %>
       </li>