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

Error while loading /settings #1364

Browse Source
This commit is contained in:
Karel Pičman 2022-06-07 14:16:48 +02:00
parent 97c1b22404
commit 731a9bf404
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -22,8 +22,8 @@
module RedmineDmsf
module Patches
# TODO: This is just a workaround to fix alias_method usage in redmine_resources plugin, which is in conflict with
# prepend and causes an infinite loop with RedmineUp's Resource plugin .
# TODO: This is just a workaround to fix alias_method usage in RedmineUp's plugins, which is in conflict with
# prepend and causes an infinite loop.
module NotifiableRuPatch
def self.included(base)
@ -54,6 +54,7 @@ module RedmineDmsf
end
# Apply the patch
if Redmine::Plugin.installed?(:redmine_contacts) && !Redmine::Plugin.installed?(:easy_extensions)
if (Redmine::Plugin.installed?(:redmine_contacts) || Redmine::Plugin.installed?(:redmine_questions)) &&
!Redmine::Plugin.installed?(:easy_extensions)
Redmine::Notifiable.send :include, RedmineDmsf::Patches::NotifiableRuPatch
end