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

#1354 split into two independent patches

Browse Source
This commit is contained in:
Karel Pičman 2022-05-16 10:04:04 +02:00
parent f9c3b737f1
commit af16383439
3 changed files with 69 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/redmine_dmsf.rb
View File

@ -40,7 +40,14 @@ require File.dirname(__FILE__) + '/redmine_dmsf/patches/user_patch'
require File.dirname(__FILE__) + '/redmine_dmsf/patches/issue_patch'
require File.dirname(__FILE__) + '/redmine_dmsf/patches/role_patch'
require File.dirname(__FILE__) + '/redmine_dmsf/patches/queries_controller_patch'
require File.dirname(__FILE__) + '/redmine_dmsf/patches/notifiable_patch'
# redmine_resources depends on redmine_contact and redmine_contacts is alphabetically sorted before redmine_dmsf
# in the plugin list.
if Redmine::Plugin.installed?(:redmine_contacts) && !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'
end
if defined?(EasyExtensions)
require File.dirname(__FILE__) + '/redmine_dmsf/patches/easy_crm_case_patch'

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

@ -48,34 +48,6 @@ module RedmineDmsf
end
# 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.
module RedmineUpNotifiablePatch
def self.included(base)
base.extend ClassMethods
base.class_eval do
unloadable
class << self
alias_method :all_without_resources_dmsf, :all
alias_method :all, :all_with_resources_dmsf
end
end
end
module ClassMethods
def all_with_resources_dmsf
notifications = all_without_resources_dmsf
notifications << Redmine::Notifiable.new('dmsf_workflow_plural')
notifications << Redmine::Notifiable.new('dmsf_legacy_notifications')
notifications
end
end
end
end
end
@ -83,12 +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
else
# redmine_resources depends on redmine_contact and redmine_contacts if alphabetically sorted before redmine_dmsf
# in the plugin list.
if Redmine::Plugin.installed?(:redmine_contacts)
Redmine::Notifiable.send :include, RedmineDmsf::Patches::RedmineUpNotifiablePatch
else
Redmine::Notifiable.prepend RedmineDmsf::Patches::NotifiablePatch
end
elsif !Redmine::Plugin.installed?(:redmine_contacts)
Redmine::Notifiable.prepend RedmineDmsf::Patches::NotifiablePatch
end

59
lib/redmine_dmsf/patches/notifiable_ru_patch.rb Normal file
View File

@ -0,0 +1,59 @@
# encoding: utf-8
# frozen_string_literal: true
#
# Redmine plugin for Document Management System "Features"
#
# Copyright © 2011-22 Karel Pičman <karel.picman@kontron.com>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
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 .
module NotifiableRuPatch
def self.included(base)
base.extend ClassMethods
base.class_eval do
unloadable
class << self
alias_method :all_without_resources_dmsf, :all
alias_method :all, :all_with_resources_dmsf
end
end
end
module ClassMethods
def all_with_resources_dmsf
notifications = all_without_resources_dmsf
notifications << Redmine::Notifiable.new('dmsf_workflow_plural')
notifications << Redmine::Notifiable.new('dmsf_legacy_notifications')
notifications
end
end
end
end
end
# Apply the patch
if Redmine::Plugin.installed?(:redmine_contacts) && !Redmine::Plugin.installed?(:easy_extensions)
Redmine::Notifiable.send :include, RedmineDmsf::Patches::NotifiableRuPatch
end