Ruby prepend replaced with prepend from RedmineExtensions

This commit is contained in:
Karel Picman 2018-03-15 12:13:06 +01:00
parent 75e120f4c9
commit eb4d86b819
5 changed files with 37 additions and 28 deletions

View File

@ -33,4 +33,5 @@ module RedmineDmsf
end end
end end
Redmine::Acts::Attachable::InstanceMethods.send(:prepend, RedmineDmsf::Patches::AttachablePatch) RedmineExtensions::PatchManager.register_helper_patch 'Redmine::Acts::Attachable::InstanceMethods',
'RedmineDmsf::Patches::AttachablePatch', prepend: true

View File

@ -47,4 +47,5 @@ module RedmineDmsf
end end
end end
CustomFieldsHelper.send(:prepend, RedmineDmsf::Patches::CustomFieldsHelperPatch) RedmineExtensions::PatchManager.register_helper_patch 'CustomFieldsHelper',
'RedmineDmsf::Patches::CustomFieldsHelperPatch', prepend: true

View File

@ -95,7 +95,11 @@ module RedmineDmsf
################################################################################################################## ##################################################################################################################
# New methods # New methods
EasyCrmCasesController::before_action :controller_easy_crm_cases_before_save, only: [:create, :update, :bulk_update] def self.prepended(base)
base.class_eval do
before_action :controller_easy_crm_cases_before_save, only: [:create, :update, :bulk_update]
end
end
def controller_easy_crm_cases_before_save def controller_easy_crm_cases_before_save
easy_crm_cases = @easy_crm_cases easy_crm_cases = @easy_crm_cases
@ -112,6 +116,6 @@ module RedmineDmsf
end end
end end
if Redmine::Plugin.installed?(:easy_crm) RedmineExtensions::PatchManager.register_controller_patch 'EasyCrmCasesController',
EasyCrmCasesController.send(:prepend, RedmineDmsf::Patches::EasyCrmCasesControllerPatch) 'RedmineDmsf::Patches::EasyCrmCasesControllerPatch', prepend: true,
end if: proc { Redmine::Plugin.installed?(:easy_crm) }

View File

@ -42,29 +42,30 @@ module RedmineDmsf
################################################################################################################## ##################################################################################################################
# New methods # New methods
def self.prepended(base)
Project.include Redmine::NestedSet::Traversing base.class_eval do
has_many :dmsf_files, -> { where(dmsf_folder_id: nil).order(:name) },
Project.has_many :dmsf_files, -> { where(dmsf_folder_id: nil).order(:name) },
:class_name => 'DmsfFile', :foreign_key => 'project_id', :dependent => :destroy :class_name => 'DmsfFile', :foreign_key => 'project_id', :dependent => :destroy
Project.has_many :dmsf_folders, ->{ where(:dmsf_folder_id => nil).order(:title) }, has_many :dmsf_folders, ->{ where(:dmsf_folder_id => nil).order(:title) },
:class_name => 'DmsfFolder', :foreign_key => 'project_id', :dependent => :destroy :class_name => 'DmsfFolder', :foreign_key => 'project_id', :dependent => :destroy
Project.has_many :dmsf_workflows, :dependent => :destroy has_many :dmsf_workflows, :dependent => :destroy
Project.has_many :folder_links, -> { where dmsf_folder_id: nil, target_type: 'DmsfFolder' }, has_many :folder_links, -> { where dmsf_folder_id: nil, target_type: 'DmsfFolder' },
:class_name => 'DmsfLink', :foreign_key => 'project_id', :dependent => :destroy :class_name => 'DmsfLink', :foreign_key => 'project_id', :dependent => :destroy
Project.has_many :file_links, -> { where dmsf_folder_id: nil, target_type: 'DmsfFile' }, has_many :file_links, -> { where dmsf_folder_id: nil, target_type: 'DmsfFile' },
:class_name => 'DmsfLink', :foreign_key => 'project_id', :dependent => :destroy :class_name => 'DmsfLink', :foreign_key => 'project_id', :dependent => :destroy
Project.has_many :url_links, -> { where dmsf_folder_id: nil, target_type: 'DmsfUrl' }, has_many :url_links, -> { where dmsf_folder_id: nil, target_type: 'DmsfUrl' },
:class_name => 'DmsfLink', :foreign_key => 'project_id', :dependent => :destroy :class_name => 'DmsfLink', :foreign_key => 'project_id', :dependent => :destroy
Project.has_many :dmsf_links, -> { where dmsf_folder_id: nil }, has_many :dmsf_links, -> { where dmsf_folder_id: nil },
:class_name => 'DmsfLink', :foreign_key => 'project_id', :dependent => :destroy :class_name => 'DmsfLink', :foreign_key => 'project_id', :dependent => :destroy
Project.before_save :set_default_dmsf_notification before_save :set_default_dmsf_notification
Project.validates_length_of :dmsf_description, :maximum => 65535 validates_length_of :dmsf_description, :maximum => 65535
Project.const_set(:ATTACHABLE_DMS_AND_ATTACHMENTS, 1) const_set(:ATTACHABLE_DMS_AND_ATTACHMENTS, 1)
Project.const_set(:ATTACHABLE_ATTACHMENTS, 2) const_set(:ATTACHABLE_ATTACHMENTS, 2)
end
end
def set_default_dmsf_notification def set_default_dmsf_notification
if self.new_record? if self.new_record?
@ -114,4 +115,5 @@ module RedmineDmsf
end end
end end
Project.send(:prepend, RedmineDmsf::Patches::ProjectPatch) RedmineExtensions::PatchManager.register_model_patch 'Project',
'RedmineDmsf::Patches::ProjectPatch', prepend: true

View File

@ -41,4 +41,5 @@ module RedmineDmsf
end end
end end
ProjectsHelper.send(:prepend, RedmineDmsf::Patches::ProjectTabsExtended) RedmineExtensions::PatchManager.register_helper_patch 'ProjectsHelper',
'RedmineDmsf::Patches::ProjectTabsExtended', prepend: true