redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'devel' of github.com:danmunn/redmine_dmsf into devel

Browse Source
This commit is contained in:
Karel Pičman 2024-12-17 13:25:01 +01:00
commit d16f3a2c52
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/dmsf_mailer.rb
View File

@ -158,9 +158,19 @@ class DmsfMailer < Mailer
@notice = notice @notice = notice
@author = revision.dmsf_workflow_assigned_by_user @author = revision.dmsf_workflow_assigned_by_user
@author ||= User.anonymous @author ||= User.anonymous
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, mail to: user,
subject: subject:
"[#{@project.name} - #{l(:field_label_dmsf_workflow)}] #{@workflow.name} #{l(subject_id)} #{step_name}" "[#{@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 end
# force_notification = true => approval workflow's notifications # force_notification = true => approval workflow's notifications

2
config/locales/de.yml
View File

@ -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 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. 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 label_inherited_permissions: Zugriff vererbt für
button_edit_content: Dokument bearbeiten button_edit_content: Dokument bearbeiten