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

Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

This commit is contained in:
cxt 2016-05-24 09:51:45 +08:00
parent 13676ec9c3 b1c70db28a
commit 6af9e849d9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/news.rb
View File

@ -169,7 +169,7 @@ class News < ActiveRecord::Base
if self.course if self.course
self.course.members.each do |m| self.course.members.each do |m|
if m.user_id != self.author_id if m.user_id != self.author_id
self.delay.send_message(m.user_id, self.course_id) # self.delay.send_message(m.user_id, self.course_id)
count = ShieldWechatMessage.where("container_type='User' and container_id=#{m.user_id} and shield_type='Course' and shield_id=#{self.course_id}").count count = ShieldWechatMessage.where("container_type='User' and container_id=#{m.user_id} and shield_type='Course' and shield_id=#{self.course_id}").count
if count == 0 if count == 0
ws = WechatService.new ws = WechatService.new
@ -189,9 +189,9 @@ class News < ActiveRecord::Base
end end
end end
def send_message user_id, course_id # def send_message user_id, course_id
self.course_messages << CourseMessage.new(:user_id => user_id, :course_id => course_id, :viewed => false) # self.course_messages << CourseMessage.new(:user_id => user_id, :course_id => course_id, :viewed => false)
end # end
# Time 2015-03-31 13:50:54 # Time 2015-03-31 13:50:54
# Author lizanle # Author lizanle