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 @@
<%= link_to jour.user, user_path(jour.user),:style => " font-weight:bold; color:#15bccf; margin-right:30px; background:none;", :target => "_blank"%> - <%= jour.created_on %> + <%= format_time(jour.created_on) %> <% if show_score %> <%= l(:label_work_rating) %>: