Merge branch 'devel' of github.com:danmunn/redmine_dmsf into devel
This commit is contained in:
commit
d16f3a2c52
@ -158,9 +158,19 @@ class DmsfMailer < Mailer
|
||||
@notice = notice
|
||||
@author = revision.dmsf_workflow_assigned_by_user
|
||||
@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,
|
||||
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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user