Redstoner/redstoner.com
Archived
0
Fork 0
Code Issues Pull Requests 2 Wiki Activity

mentioning fixes

Browse Source
This commit is contained in:
jomo
2014-07-06 05:07:30 +02:00
parent b1d797ce06
commit d385136114
5 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/blogpost.rb
View File

@@ -31,7 +31,7 @@ class Blogpost < ActiveRecord::Base
mails = []
new_mentions.each do |user|
begin
mails << RedstonerMailer.new_post_mention_mail(user, self)
mails << RedstonerMailer.new_post_mention_mail(user, self) if user.normal? && user.confirmed? && user.mail_mention?
rescue => e
Rails.logger.error "---"
Rails.logger.error "WARNING: Failed to create new_post_mention_mail (view) for post#: #{@self.id}, user: #{@user.name}, #{@user.email}"

2
app/models/comment.rb
View File

@@ -63,7 +63,7 @@ class Comment < ActiveRecord::Base
mails = []
new_mentions.each do |user|
begin
mails << RedstonerMailer.new_post_comment_mention_mail(user, self)
mails << RedstonerMailer.new_post_comment_mention_mail(user, self) if user.normal? && user.confirmed? && user.mail_mention?
rescue => e
Rails.logger.error "---"
Rails.logger.error "WARNING: Failed to create new_post_comment_mention_mail (view) for reply#: #{@self.id}, user: #{@user.name}, #{@user.email}"

2
app/models/forumthread.rb
View File

@@ -47,7 +47,7 @@ class Forumthread < ActiveRecord::Base
mails = []
new_mentions.each do |user|
begin
mails << RedstonerMailer.new_thread_mention_mail(user, self)
mails << RedstonerMailer.new_thread_mention_mail(user, self) if user.normal? && user.confirmed? && user.mail_mention?
rescue => e
Rails.logger.error "---"
Rails.logger.error "WARNING: Failed to create new_thread_mention_mail (view) for reply#: #{@self.id}, user: #{@user.name}, #{@user.email}"

2
app/models/threadreply.rb
View File

@@ -38,7 +38,7 @@ class Threadreply < ActiveRecord::Base
mails = []
new_mentions.each do |user|
begin
mails << RedstonerMailer.new_thread_reply_mention_mail(user, self)
mails << RedstonerMailer.new_thread_reply_mention_mail(user, self) if user.normal? && user.confirmed? && user.mail_mention?
rescue => e
Rails.logger.error "---"
Rails.logger.error "WARNING: Failed to create new_thread_reply_mention_mail (view) for reply#: #{@self.id}, user: #{@user.name}, #{@user.email}"

3
app/views/users/edit_notifications.html.erb
View File

@@ -37,8 +37,7 @@
</tr>
<tr>
<td>
mentions me in a thread or comment<br>
<i>(Not yet implemented)</i>
mentions me in a thread or comment
</td>
<td>
<%= f.check_box :mail_mention %>