From 4a72dd3380aecb7770165e2dd756742dd3627250 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Tue, 4 Nov 2014 10:57:56 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=95=99=E8=A8=80=E4=B8=AD=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=822=E6=95=99=E5=B8=88=E8=AF=84=E8=AE=BA?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_attach_controller.rb | 2 +-
 app/views/homework_attach/_jour.html.erb      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb
index d601d32a1..443bdfb89 100644
--- a/app/controllers/homework_attach_controller.rb
+++ b/app/controllers/homework_attach_controller.rb
@@ -461,7 +461,7 @@ class HomeworkAttachController < ApplicationController
         @anonymous_comments = @homework.journals_for_messages.where("is_comprehensive_evaluation = 2 and user_id in #{convert_array(annymous_users)}").order("created_on DESC")
       end
     elsif @add_jour.is_comprehensive_evaluation == 1
-      teachers = searchTeacherAndAssistant @course
+      teachers = searchTeacherAndAssistant @homework.bid.courses.first
       @comprehensive_evaluation = []
       teachers.each do|teacher|
         temp = @homework.journals_for_messages.where("is_comprehensive_evaluation = 1 and user_id = #{teacher.user_id}").order("created_on DESC").first
diff --git a/app/views/homework_attach/_jour.html.erb b/app/views/homework_attach/_jour.html.erb
index 95892dd78..53dfa412b 100644
--- a/app/views/homework_attach/_jour.html.erb
+++ b/app/views/homework_attach/_jour.html.erb
@@ -11,7 +11,7 @@
   <div class="ping_discon">
     <div class="ping_distop">
       <span><%= link_to jour.user, user_path(jour.user),:style => " font-weight:bold; color:#15bccf; margin-right:30px; background:none;", :target => "_blank"%></span>
-      <span style="color:#a6a6a6; margin-right:40px; margin-left:30px;"><%= jour.created_on %></span>
+      <span style="color:#a6a6a6; margin-right:40px; margin-left:30px;"><%= format_time(jour.created_on) %></span>
       <span style="font-weight:bold; color:#a6a6a6; ">
         <% if show_score %>
           <%= l(:label_work_rating) %>：