Merge branch 'develop' into 'develop'

bug



See merge request !182

app/models/student_works_score.rb

@@ -19,7 +19,7 @@ class StudentWorksScore < ActiveRecord::Base
     if self.student_work && self.student_work.user && self.student_work.homework_common.course
       receiver = self.student_work.user
       # 判断是第一次评阅还是更新 status:0 新建；1 更新
-      if self.created_at == self.updated_at
+      if (self.updated_at - self.created_at) < 60
         if self.comment.nil? && self.score
           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)

app/views/users/_user_message_course.html.erb

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