From 589f939bbd1a0ac148b280fee7957ff09fd2382b Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Thu, 24 Mar 2016 11:39:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=B1=BB=E5=9E=8B=E2=80=9C?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=86=8D=E6=AC=A1=E6=8F=90=E4=BA=A4=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E2=80=9D=E4=B8=AD=E7=9A=84=E9=93=BE=E6=8E=A5=EF=BC=8C?=
 =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=89=93=E5=BC=80=E5=AD=A6=E7=94=9F=E4=BD=9C?=
 =?UTF-8?q?=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/principal.rb                            | 2 +-
 app/views/student_work/_student_work_list.html.erb | 4 ++--
 app/views/users/_user_message_course.html.erb      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/principal.rb b/app/models/principal.rb
index c027f020e..2c8465538 100644
--- a/app/models/principal.rb
+++ b/app/models/principal.rb
@@ -52,7 +52,7 @@ class Principal < ActiveRecord::Base
         sql << " OR (LOWER(#{table_name}.firstname) LIKE LOWER(:b) AND LOWER(#{table_name}.lastname) LIKE LOWER(:a))"
         params.merge!(:a => a, :b => b)
       end
-p      where(sql, params)
+      where(sql, params)
     end
   }
 
diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb
index f9f55456b..8b2f57723 100644
--- a/app/views/student_work/_student_work_list.html.erb
+++ b/app/views/student_work/_student_work_list.html.erb
@@ -46,8 +46,8 @@
 <% end%>
 <script type="text/javascript">
   $(function(){
-      <% if !@is_evaluation && !@is_teacher %>
-          <% work=@homework.student_works.where("user_id = ?",User.current.id).first %>
+      <% if !@is_evaluation && (!@is_teacher || params[:show_work_id].present?) %>
+          <% work= params[:show_work_id].nil? ? @homework.student_works.where("user_id = ?",User.current.id).first : StudentWork.find(params[:show_work_id]) %>
           <% unless work.nil? %>
               <% if @homework.homework_type == 2 %>
                   $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show',:locals => {:work =>work,:score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc")}) %>");
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index 45d833a9a..b1f2900c9 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -437,7 +437,7 @@
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">重新提交了作品：</span>
           </li>
           <li class="homepageNewsContent fl">
-            <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.homework_common_id),
+            <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.homework_common_id, :show_work_id => ma.course_message_id),
                         :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
             <%#= link_to truncate(ma.course_message.name,:length=>25)+'(失败原因：提交作品的人数低于2人)', student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "c_red" : "newsGrey "}" %>
             <!--:onmouseover => "message_titile_show($(this),event)",-->