Skip to content

Commit

Permalink
Merge branch 'devel' of github.com:danmunn/redmine_dmsf into devel
Browse files Browse the repository at this point in the history
  • Loading branch information
picman committed Dec 17, 2024
2 parents d610368 + 4aa6ac4 commit d16f3a2
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 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
2 changes: 1 addition & 1 deletion config/locales/de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ de:
text_dmsf_fast_links_info: Ermöglicht durch Eingabe der Ordner-ID auf einfache Art und Weise eine Verknüpfung
auf den Zielordner zu erstellen.

label_dmsf_permissions: Zugriff erlaubt für
label_dmsf_permissions: Zugriff ausschließlich erlaubt für
label_inherited_permissions: Zugriff vererbt für

button_edit_content: Dokument bearbeiten
Expand Down

0 comments on commit d16f3a2

Please sign in to comment.