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

Merge branch 'devel' of github.com:danmunn/redmine_dmsf into devel

Browse Source
This commit is contained in:
Karel Pičman 2022-08-17 14:04:54 +02:00
commit f3e80bb502
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/redmine_dmsf.rb
View File

@ -42,7 +42,7 @@ require File.dirname(__FILE__) + '/redmine_dmsf/patches/pdf_patch'
# A workaround for obsolete 'alias_method' usage in RedmineUp's plugins
if (RedmineDmsf::Plugin.present?(:redmine_questions) || Redmine::Plugin.installed?(:redmine_contacts) ||
Redmine::Plugin.installed?(:redmine_checklist)) && !Redmine::Plugin.installed?(:easy_extensions)
Redmine::Plugin.installed?(:redmine_checklists)) && !Redmine::Plugin.installed?(:easy_extensions)
require File.dirname(__FILE__) + '/redmine_dmsf/patches/notifiable_ru_patch'
else
require File.dirname(__FILE__) + '/redmine_dmsf/patches/notifiable_patch'
@ -83,4 +83,4 @@ require File.dirname(__FILE__) + '/redmine_dmsf/hooks/helpers/search_helper_hook
require File.dirname(__FILE__) + '/redmine_dmsf/hooks/helpers/project_helper_hooks'
# Macros
require File.dirname(__FILE__) + '/redmine_dmsf/macros'
require File.dirname(__FILE__) + '/redmine_dmsf/macros'

4
lib/redmine_dmsf/patches/notifiable_patch.rb
View File

@ -56,6 +56,6 @@ if Redmine::Plugin.installed?(:easy_extensions)
RedmineExtensions::PatchManager.register_patch_to_be_first 'Redmine::Notifiable',
'RedmineDmsf::Patches::NotifiablePatch', prepend: true, first: true
elsif(!(RedmineDmsf::Plugin.present?(:redmine_questions) || Redmine::Plugin.installed?(:redmine_contacts) ||
Redmine::Plugin.installed?(:redmine_checklist)))
Redmine::Plugin.installed?(:redmine_checklists)))
Redmine::Notifiable.prepend RedmineDmsf::Patches::NotifiablePatch
end
end

4
lib/redmine_dmsf/patches/notifiable_ru_patch.rb
View File

@ -55,6 +55,6 @@ end
# Apply the patch
if (RedmineDmsf::Plugin.present?(:redmine_questions) || Redmine::Plugin.installed?(:redmine_contacts) ||
Redmine::Plugin.installed?(:redmine_checklist)) && !Redmine::Plugin.installed?(:easy_extensions)
Redmine::Plugin.installed?(:redmine_checklists)) && !Redmine::Plugin.installed?(:easy_extensions)
Redmine::Notifiable.send :include, RedmineDmsf::Patches::NotifiableRuPatch
end
end