gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 18433a6776 into 749115e507

Browse source
This commit is contained in:
Andrew 2023-04-19 13:36:41 +02:00 • committed by GitHub
commit a0cdc60ca5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 28 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/models/comment.rb
View file

@ -57,13 +57,19 @@ class Comment < ApplicationRecord
commentable_str.constantize.find(commentable_id)
end
private
def send_notification
EventCommentMailJob.perform_later(self)
end
def conference_id
commentable.program.conference_id
end
private
def conference
commentable.program.conference
end
def send_notification
return unless conference.email_settings.send_on_event_comment?
EventCommentMailJob.perform_later(self)
end
end

2
app/models/user.rb
View file

@ -37,7 +37,7 @@ class User < ApplicationRecord
after_save :touch_events
# add scope
scope :comment_notifiable, ->(conference) {joins(:roles).where('roles.name IN (?)', [:organizer, :cfp]).where('roles.resource_type = ? AND roles.resource_id = ?', 'Conference', conference.id)}
scope :comment_notifiable, ->(conference_id) {joins(:roles).where('roles.name IN (?)', [:organizer, :cfp]).where('roles.resource_type = ? AND roles.resource_id = ?', 'Conference', conference_id)}
# scopes for user distributions
scope :recent, lambda {