From 41ff3214bebc15b78a2e99eb00e9d381cf9e1f30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= Date: Fri, 23 Aug 2019 08:04:57 +0200 Subject: [PATCH] Conflict with other plugins containing the same init function --- after_init.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/after_init.rb b/after_init.rb index 7d9c26a9..791f8e23 100644 --- a/after_init.rb +++ b/after_init.rb @@ -25,7 +25,7 @@ require_dependency File.dirname(__FILE__) + '/lib/redmine_dmsf.rb' ActiveSupport::Dependencies.autoload_paths << File.join(File.dirname(__FILE__), 'app', 'validators') -def init +def dmsf_init # Administration menu extension Redmine::MenuManager.map :admin_menu do |menu| menu.push :dmsf_approvalworkflows, :dmsf_workflows_path, :caption => :label_dmsf_workflow_plural, @@ -90,7 +90,7 @@ end if Redmine::Plugin.installed?(:easy_extensions) ActiveSupport.on_load(:easyproject, yield: true) do - init + dmsf_init require File.expand_path('../app/models/easy_page_modules/easy_dms/epm_dmsf_locked_documents', __FILE__) require File.expand_path('../app/models/easy_page_modules/easy_dms/epm_dmsf_open_approvals', __FILE__) @@ -99,7 +99,7 @@ if Redmine::Plugin.installed?(:easy_extensions) EpmDmsfOpenApprovals.register_to_scope(:user, :plugin => :redmine_dmsf) end else - init + dmsf_init end RedmineExtensions::Reloader.to_prepare do