From 88130a4d9266d49929eb25f60b4d6ec9bb6a363f Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 30 Jun 2015 11:16:15 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=BC=BA=E8=AF=84=E6=83=85=E5=86=B5a?=
 =?UTF-8?q?dmin=E7=94=A8=E6=88=B7=E5=8F=AF=E4=BB=A5=E7=9C=8B=E5=88=B0?=
 =?UTF-8?q?=EF=BC=8C=E5=88=87=E4=BD=9C=E4=B8=9A=E7=9A=84=E4=BB=BB=E4=BD=95?=
 =?UTF-8?q?=E9=98=B6=E6=AE=B5=E9=83=BD=E5=8F=AF=E4=BB=A5=E7=9C=8B=E5=88=B0?=
 =?UTF-8?q?=202=E3=80=81=E5=BA=94=E8=AF=84=E6=95=B0=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=8C=BF=E8=AF=84=E5=88=86=E9=85=8D=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb | 2 +-
 app/views/student_work/index.html.erb      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index e695a6fb0..568357b3c 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -251,7 +251,7 @@ class StudentWorkController < ApplicationController
       work_ids = "(" + @homework.student_works.map(&:id).join(",") + ")"
       @stundet_works = StudentWork.find_by_sql("SELECT *,(all_count - has_count) AS absence FROM(
       SELECT * ,
-        (SELECT COUNT(*) FROM `student_works_evaluation_distributions` WHERE user_id = student_works.user_id AND student_work_id IN #{work_ids}) AS all_count,
+        (SELECT evaluation_num FROM homework_detail_manuals WHERE  homework_detail_manuals.homework_common_id = #{@homework.id}) AS all_count,
         (SELECT COUNT(*) FROM `student_works_scores` WHERE user_id = student_works.user_id AND student_work_id IN #{work_ids}) AS has_count
       FROM `student_works`
       WHERE homework_common_id = #{@homework.id}
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index e0d1f8bad..2d26601d1 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -50,7 +50,7 @@
       <% if @show_all%>
         <input  type="text" value="<%= @name%>" placeholder="昵称、学号、姓名搜索" class="min_search ml10 fl" onkeypress="SearchByName($(this),'<%= student_work_index_path(:homework => @homework.id)%>',event);">
         <a class="student_work_search fl" onclick="SearchByName_1($(this).prev(),'<%= student_work_index_path(:homework => @homework.id)%>');" href="javascript:void(0)">搜索</a>
-        <%= link_to "缺评情况",student_work_absence_penalty_student_work_index_path(:homework => @homework.id), :class => "student_work_search fl", :target => "_blank" if @is_teacher && @homework.homework_type == 1 && @homework.homework_detail_manual.comment_status != 1 %>
+        <%= link_to("缺评情况",student_work_absence_penalty_student_work_index_path(:homework => @homework.id), :class => "student_work_search fl", :target => "_blank") if((@is_teacher || User.current.admin?) && @homework.homework_type == 1) %>
       <% end%>
       <% if @is_teacher%>
           <div class="fr">