From e7a6ae5ddd4c14cb0c2d42be221d306de2c8a36d Mon Sep 17 00:00:00 2001 From: Karel Picman Date: Wed, 20 Jul 2016 09:51:25 +0200 Subject: [PATCH] Approval workflow email notifications #544 --- app/controllers/dmsf_workflows_controller.rb | 4 ++-- app/models/dmsf_mailer.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/dmsf_workflows_controller.rb b/app/controllers/dmsf_workflows_controller.rb index 98a988b9..9646388b 100644 --- a/app/controllers/dmsf_workflows_controller.rb +++ b/app/controllers/dmsf_workflows_controller.rb @@ -56,7 +56,7 @@ class DmsfWorkflowsController < ApplicationController end if revision.workflow == DmsfWorkflow::STATE_APPROVED # Just approved - recipients = DmsfMailer.get_notify_users(@project) + recipients = DmsfMailer.get_notify_users(@project, [revision.dmsf_file]) recipients.each do |user| DmsfMailer.workflow_notification( user, @@ -78,7 +78,7 @@ class DmsfWorkflowsController < ApplicationController recipients = @dmsf_workflow.participiants recipients.push User.find_by_id revision.dmsf_workflow_assigned_by recipients.uniq! - recipients = recipients & DmsfMailer.get_notify_users(@project) + recipients = recipients & DmsfMailer.get_notify_users(@project, [revision.dmsf_file]) recipients.each do |user| DmsfMailer.workflow_notification( user, diff --git a/app/models/dmsf_mailer.rb b/app/models/dmsf_mailer.rb index 1f06bd48..70877fd8 100644 --- a/app/models/dmsf_mailer.rb +++ b/app/models/dmsf_mailer.rb @@ -83,8 +83,8 @@ class DmsfMailer < Mailer end end - def self.get_notify_users(project, files = nil) - if files + def self.get_notify_users(project, files = []) + if files.present? notify_files = files.select { |file| file.notify? } return [] if notify_files.empty? end