From a4953c3a5ac623e180b61d1ae74616ef6d2c8bbd Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 29 Sep 2015 11:02:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E5=90=AF?= =?UTF-8?q?=E5=8C=BF=E8=AF=84=E5=A4=B1=E8=B4=A5=E5=8F=91=E9=80=81=E9=82=AE?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=96=B9=E6=B3=95=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/mailer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 52b7242dd..a8ba4f4ee 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -89,7 +89,7 @@ class Mailer < ActionMailer::Base recipients ||= [] # 只给该课程的老师发送邮件提醒 course.members.each do |member| - if m.user.allowed_to?(:as_teacher,course) + 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)}" @token = Token.get_token_from_user(user, 'autologin') From 1f77b0587976b26e910d23369ead201dce855ae2 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 29 Sep 2015 14:16:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=98=AF=E8=87=AA?= =?UTF-8?q?=E5=B7=B1=E5=8F=91=E5=B8=83=E7=9A=84=E4=BD=9C=E4=B8=9A=E6=B6=88?= =?UTF-8?q?=E6=81=AF=EF=BC=8C=E6=8F=90=E7=A4=BA=E8=AF=AD=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E2=80=9C=E6=82=A8=E2=80=9D,=E8=80=8C=E9=9D=9E=E6=9F=90?= =?UTF-8?q?=E6=9F=90=E8=80=81=E5=B8=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_message_course.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index 7d6044e64..809a87085 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -138,7 +138,7 @@