jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1、留言中时间显示不正确问题。2教师评论失败问题

This commit is contained in:
z9hang 2014-11-04 10:57:56 +08:00
parent 385009b688
commit 4a72dd3380
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/homework_attach_controller.rb
View File

@ -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") @anonymous_comments = @homework.journals_for_messages.where("is_comprehensive_evaluation = 2 and user_id in #{convert_array(annymous_users)}").order("created_on DESC")
end end
elsif @add_jour.is_comprehensive_evaluation == 1 elsif @add_jour.is_comprehensive_evaluation == 1
teachers = searchTeacherAndAssistant @course teachers = searchTeacherAndAssistant @homework.bid.courses.first
@comprehensive_evaluation = [] @comprehensive_evaluation = []
teachers.each do|teacher| 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 temp = @homework.journals_for_messages.where("is_comprehensive_evaluation = 1 and user_id = #{teacher.user_id}").order("created_on DESC").first

2
app/views/homework_attach/_jour.html.erb
View File

@ -11,7 +11,7 @@
<div class="ping_discon"> <div class="ping_discon">
<div class="ping_distop"> <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><%= 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; "> <span style="font-weight:bold; color:#a6a6a6; ">
<% if show_score %> <% if show_score %>
<%= l(:label_work_rating) %>： <%= l(:label_work_rating) %>：