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

Approval workflow notifications are sent to locked users #1013

Browse Source
This commit is contained in:
Karel Pičman 2019-06-18 15:00:40 +02:00
parent 1697de4a21
commit 3178690fc6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/dmsf_workflows_controller.rb
View File

@ -112,7 +112,7 @@ class DmsfWorkflowsController < ApplicationController
else
if action.action == DmsfWorkflowStepAction::ACTION_DELEGATE
# Delegation
delegate = User.find_by(id: params[:step_action].to_i / 10)
delegate = User.active.find_by(id: params[:step_action].to_i / 10)
if DmsfMailer.get_notify_users(@project, [revision.dmsf_file], true).include?(delegate)
DmsfMailer.deliver_workflow_notification(
[delegate],

2
app/models/dmsf_mailer.rb
View File

@ -123,7 +123,7 @@ class DmsfMailer < Mailer
notify_files = files.select { |file| file.notify? }
return [] if notify_files.empty?
end
notify_members = project.members.select do |notify_member|
notify_members = project.members.active.select do |notify_member|
notify_user = notify_member.user
if notify_user == User.current && notify_user.pref.no_self_notified
false