Merge branch 'develop' into szzh

2014-06-06 08:51:52 +08:00 · 2014-06-06 08:51:52 +08:00 · 7b98d01d8a
parent 0d8b06ec87 c5fc1a8709
commit 7b98d01d8a
1 changed files with 6 additions and 1 deletions
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@ -70,6 +70,11 @@ class Mailer < ActionMailer::Base
      end
      mail :to => @recipients,
           :subject => "#{l(:label_your_course)}#{journals_for_message.jour.name}#{l(:label_have_message)} "
+    elsif journals_for_message.jour.class.to_s.to_sym == :Bid
+      if !journals_for_message.jour.author.notify_about? journals_for_message
+        return -1
+      end
+        mail :to => journals_for_message.jour.author.mail, :subject => @title
      else
      mail :to => @mail.mail, :subject => @title
    end