From c5fc1a87098e6e6c2db5fc4805fbab5fdb9409f6 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Thu, 5 Jun 2014 15:00:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index e0ad54296..c5628cf2e 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -66,7 +66,12 @@ class Mailer < ActionMailer::Base
       end
       mail :to => @recipients,
            :subject => "#{l(:label_your_course)}#{journals_for_message.jour.name}#{l(:label_have_message)} "
-    else
+    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
 

From 174c5556a01afcf6dc63ecc490ada1c2fa490e17 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmail.com>
Date: Fri, 6 Jun 2014 09:26:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=87=8F=E5=B0=91sql=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=8C=20logger=20=3D=3D=3D>=20Rails.logger?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/courses_helper.rb | 2 +-
 app/models/mailer.rb          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index f16aef911..5531f3f82 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -150,7 +150,7 @@ module CoursesHelper
   #当前用户是不是指定课程的学生
   def is_cur_course_student? course
     people = []
-    course.members.each do |member|
+    course.members.includes(:roles, :user).each do |member|
       if StudentRoles.include? member.roles.first.id
         people <<  member.user
       end
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index ed6cdd25a..e954f03c8 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -51,7 +51,7 @@ class Mailer < ActionMailer::Base
              when :User
                user_newfeedback_user_url(journals_for_message.jour, anchor: "word_li_#{journals_for_message.id}")
              else
-               logger.error "[Builds a Mail::Message ERROR] journalsForMessage's jour is unkown type, journalsForMessage.id = #{journals_for_message.id}"
+               Rails.logger.error "[Builds a Mail::Message ERROR] journalsForMessage's jour is unkown type, journalsForMessage.id = #{journals_for_message.id}"
                return -1
            end
     #如果是直接留言并且留言对象是Project并且Project类型是课程