jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

This commit is contained in:
z9hang 2014-06-06 10:08:11 +08:00
parent 09368442c6 174c5556a0
commit 1c461dc8ef
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/courses_helper.rb
View File

@ -150,7 +150,7 @@ module CoursesHelper
#当前用户是不是指定课程的学生 #当前用户是不是指定课程的学生
def is_cur_course_student? course def is_cur_course_student? course
people = [] people = []
course.members.each do |member| course.members.includes(:roles, :user).each do |member|
if StudentRoles.include? member.roles.first.id if StudentRoles.include? member.roles.first.id
people << member.user people << member.user
end end

2
app/models/mailer.rb
View File

@ -51,7 +51,7 @@ class Mailer < ActionMailer::Base
when :User when :User
user_newfeedback_user_url(journals_for_message.jour, anchor: "word_li_#{journals_for_message.id}") user_newfeedback_user_url(journals_for_message.jour, anchor: "word_li_#{journals_for_message.id}")
else 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 return -1
end end
#如果是直接留言并且留言对象是Project并且Project类型是课程 #如果是直接留言并且留言对象是Project并且Project类型是课程