diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb index c1e5666ac..796080645 100644 --- a/app/models/homework_common.rb +++ b/app/models/homework_common.rb @@ -40,9 +40,9 @@ class HomeworkCommon < ActiveRecord::Base def act_as_course_message if self.course self.course.members.each do |m| - if m.user_id != self.user_id + # if m.user_id != self.user_id self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false) - end + # end end end end diff --git a/app/models/mailer.rb b/app/models/mailer.rb index a8ba4f4ee..6c4aca02d 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -53,16 +53,17 @@ class Mailer < ActionMailer::Base recipients ||= [] course.members.each do |member| user = User.find(member.user_id) - # @subject = "#{l(:mail_homework)}#{homework_common.name} #{l(:mail_anonymous_comment_open)}" + @subject = "#{l(:mail_homework)}#{homework_common.name} #{l(:mail_anonymous_comment_open)}" @token = Token.get_token_from_user(user, 'autologin') @anonymous_comment_close_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value)) @anonymous_comment_close_name = homework_common.name @author = homework_common.user #收件人邮箱 + recipients << user.mail end mail :to => recipients, - :subject => "[#{l(:mail_homework)}#{homework_common.name}] #{l(:mail_anonymous_comment_open)}" + :subject => @subject end # 作业匿评关闭 @@ -71,7 +72,7 @@ class Mailer < ActionMailer::Base recipients ||= [] course.members.each do |member| user = User.find(member.user_id) - #@subject = "#{l(:mail_homework)}#{homework_common.name} #{l(:mail_anonymous_comment_open)}" + @subject = "#{l(:mail_homework)}#{homework_common.name} #{l(:mail_anonymous_comment_close)}" @token = Token.get_token_from_user(user, 'autologin') @anonymous_comment_close_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value)) @anonymous_comment_close_name = homework_common.name @@ -80,7 +81,7 @@ class Mailer < ActionMailer::Base recipients << user.mail end mail :to => recipients, - :subject => "[#{l(:mail_homework)}#{homework_common.name}] #{l(:mail_anonymous_comment_open)}" + :subject => @subject end # 匿评失败给老师发送邮件通知 @@ -91,17 +92,21 @@ class Mailer < ActionMailer::Base course.members.each do |member| if member.user.allowed_to?(:as_teacher,course) user = User.find(member.user_id) - #@subject = "[#{l(:mail_homework)} #{homework_common.name}] #{l(:mail_anonymous_comment_failed)}" + @subject = "[#{l(:mail_homework)} #{homework_common.name}] #{l(:mail_anonymous_comment_failed)}" @token = Token.get_token_from_user(user, 'autologin') @anonymous_comment_fail_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value)) @anonymous_comment_fail_name = homework_common.name @author = homework_common.user #收件人邮箱 + puts "######################" + puts homework_common.id + puts recipients + puts "######################" recipients << user.mail end end mail :to => recipients, - :subject => "[#{l(:mail_homework)} #{homework_common.name}] #{l(:mail_anonymous_comment_failed)}" + :subject => @subject end # author: alan diff --git a/app/views/users/_user_message_forge.html.erb b/app/views/users/_user_message_forge.html.erb index 641fb9269..b93122bd2 100644 --- a/app/views/users/_user_message_forge.html.erb +++ b/app/views/users/_user_message_forge.html.erb @@ -197,7 +197,7 @@
  • <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %> ">评论了新闻:
  • - <%= link_to "#{ma.forge_message.comments.html_safe}", + <%= link_to "#{ma.forge_message.commented.title}", {:controller => 'news', :action => 'show', :id => ma.forge_message.commented.id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :onmouseover => "message_titile_show($(this),event)", :onmouseout => "message_titile_hide($(this))" %> diff --git a/lib/tasks/homework_evaluation.rake b/lib/tasks/homework_evaluation.rake index 63640bbb5..6cf4dd6da 100644 --- a/lib/tasks/homework_evaluation.rake +++ b/lib/tasks/homework_evaluation.rake @@ -32,7 +32,7 @@ namespace :homework_evaluation do homework_common.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 2) end # 邮件通知 - Mailer.send_mail_anonymous_comment_close(homework_common).deliver + Mailer.send_mail_anonymous_comment_open(homework_common).deliver else #作业数小于2,启动失败, 只给老师发 # status==4 发送失败 @@ -65,7 +65,10 @@ namespace :homework_evaluation do end homework_detail_manual.update_column('comment_status', 3) # 匿评关闭消息通知 给所有人发 - send_message_anonymous_comment(homework_common, 3) + course = homework_common.course + course.members.each do |m| + homework_common.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 3) + end # 邮件通知 Mailer.send_mail_anonymous_comment_close(homework_common).deliver end