qyzh1996
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into 'develop' 

bug



See merge request !182
This commit is contained in:
陈晓婷 2017-04-07 16:53:27 +08:00
parent 3e286f8ac3 1f515d4ec5
commit 09da6fad4f
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/models/student_works_score.rb
View File

@ -19,7 +19,7 @@ class StudentWorksScore < ActiveRecord::Base
if self.student_work && self.student_work.user && self.student_work.homework_common.course if self.student_work && self.student_work.user && self.student_work.homework_common.course
receiver = self.student_work.user receiver = self.student_work.user
# 判断是第一次评阅还是更新 status:0 新建；1 更新 # 判断是第一次评阅还是更新 status:0 新建；1 更新
if self.created_at == self.updated_at if (self.updated_at - self.created_at) < 60
if self.comment.nil? && self.score if self.comment.nil? && self.score
self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id, self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id,
:viewed => false, :content => "作业评分：#{self.score}", :status=> false) :viewed => false, :content => "作业评分：#{self.score}", :status=> false)

2
app/views/users/_user_message_course.html.erb
View File

@ -401,7 +401,7 @@
user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
<% end %> <% end %>
<span class="homepageNewsType fl"> <span class="homepageNewsType fl">
<%= ma.status == 0 ? "评阅了您的作品：" : "重新评阅了您的作品:" %> <%= ma.status == 0 ? "评阅了您的作品：" : "重新评阅了您的作品：" %>
</span> </span>
</li> </li>
<li class="messageInformationContents"> <li class="messageInformationContents">