From 42d381dca80ab10c68bd93692f60b510a4871793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= Date: Wed, 25 Jul 2018 13:51:25 +0200 Subject: [PATCH] Uploading file without a controller --- app/helpers/dmsf_upload_helper.rb | 8 ++++---- app/models/dmsf_workflow.rb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/helpers/dmsf_upload_helper.rb b/app/helpers/dmsf_upload_helper.rb index 2f70b028..5ba1d7c3 100644 --- a/app/helpers/dmsf_upload_helper.rb +++ b/app/helpers/dmsf_upload_helper.rb @@ -21,7 +21,7 @@ module DmsfUploadHelper include Redmine::I18n - def self.commit_files_internal(commited_files, project, folder, controller) + def self.commit_files_internal(commited_files, project, folder, controller = nil) failed_uploads = [] files = [] if commited_files && commited_files.is_a?(Hash) @@ -109,7 +109,7 @@ module DmsfUploadHelper end rescue Exception => e Rails.logger.error e.message - controller.flash[:error] = e.message + controller.flash[:error] = e.message if controller failed_uploads.push(file) end else @@ -148,7 +148,7 @@ module DmsfUploadHelper unless recipients.empty? to = recipients.collect{ |r| r.name }.first(DMSF_MAX_NOTIFICATION_RECEIVERS_INFO).join(', ') to << ((recipients.count > DMSF_MAX_NOTIFICATION_RECEIVERS_INFO) ? ',...' : '.') - controller.flash[:warning] = l(:warning_email_notifications, :to => to) + controller.flash[:warning] = l(:warning_email_notifications, :to => to) if controller end end rescue Exception => e @@ -156,7 +156,7 @@ module DmsfUploadHelper end end end - if failed_uploads.present? + if failed_uploads.present? && controller controller.flash[:warning] = l(:warning_some_files_were_not_commited, :files => failed_uploads.map{|u| u['name']}.join(', ')) end [files, failed_uploads] diff --git a/app/models/dmsf_workflow.rb b/app/models/dmsf_workflow.rb index 554978c1..e11d6750 100644 --- a/app/models/dmsf_workflow.rb +++ b/app/models/dmsf_workflow.rb @@ -235,7 +235,7 @@ class DmsfWorkflow < ActiveRecord::Base unless recipients.blank? to = recipients.collect{ |r| r.name }.first(DMSF_MAX_NOTIFICATION_RECEIVERS_INFO).join(', ') to << ((recipients.count > DMSF_MAX_NOTIFICATION_RECEIVERS_INFO) ? ',...' : '.') - controller.flash[:warning] = l(:warning_email_notifications, :to => to) + controller.flash[:warning] = l(:warning_email_notifications, :to => to) if controller end end end