Skip to content

Commit

Permalink
Merge pull request #1570 from uhuntu/master-self
Browse files Browse the repository at this point in the history
Emails are not sent to the author if no_self_notified
  • Loading branch information
picman authored Dec 6, 2024
2 parents a86e1b6 + 0ca3304 commit f2c8c4d
Showing 1 changed file with 13 additions and 3 deletions.
16 changes: 13 additions & 3 deletions app/models/dmsf_mailer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,19 @@ def workflow_notification(user, workflow, revision, subject_id, text1_id, text2_
@notice = notice
@author = revision.dmsf_workflow_assigned_by_user
@author ||= User.anonymous
mail to: user,
subject:
"[#{@project.name} - #{l(:field_label_dmsf_workflow)}] #{@workflow.name} #{l(subject_id)} #{step_name}"
skip_no_self_notified = false
begin
# We need to switch off no_self_notified temporarily otherwise the email won't be sent
if (@author == user) && @author.pref.no_self_notified
@author.pref.no_self_notified = false
skip_no_self_notified = true
end
mail to: user,
subject:
"[#{@project.name} - #{l(:field_label_dmsf_workflow)}] #{@workflow.name} #{l(subject_id)} #{step_name}"
ensure
@author.pref.no_self_notified = true if skip_no_self_notified
end
end

# force_notification = true => approval workflow's notifications
Expand Down

0 comments on commit f2c8c4d

Please sign in to comment.