RedmineExtensions::PatchManager usage

This commit is contained in:
Karel Picman 2018-03-22 16:07:58 +01:00
parent de8686c94d
commit 1e65c8bba0
13 changed files with 307 additions and 374 deletions

View File

@ -24,13 +24,15 @@
<% if object %> <% if object %>
<div> <div>
<% object.show_custom_field_values.each do |custom_value| %> <% object.custom_field_values.each do |custom_value| %>
<div class="status attribute"> <% if !custom_value.value.blank? %>
<%= content_tag :div, h(custom_value.custom_field.name), :class => 'label' %> <div class="status attribute">
<div class="value"> <%= content_tag :div, h(custom_value.custom_field.name), :class => 'label' %>
<%= show_value custom_value %> <div class="value">
<%= show_value custom_value %>
</div>
</div> </div>
</div> <% end %>
<% end %> <% end %>
</div> </div>
<% end %> <% end %>

View File

@ -26,9 +26,8 @@ DMSF_MAX_NOTIFICATION_RECEIVERS_INFO = 10
# Plugin's patches # Plugin's patches
require 'redmine_dmsf/patches/custom_fields_helper_patch' require 'redmine_dmsf/patches/custom_fields_helper_patch'
require 'redmine_dmsf/patches/acts_as_customizable' require 'redmine_dmsf/patches/projects_helper_patch'
require 'redmine_dmsf/patches/project_patch' require 'redmine_dmsf/patches/project_patch'
require 'redmine_dmsf/patches/project_tabs_extended'
require 'redmine_dmsf/patches/user_preference_patch' require 'redmine_dmsf/patches/user_preference_patch'
require 'redmine_dmsf/patches/user_patch' require 'redmine_dmsf/patches/user_patch'
require 'redmine_dmsf/patches/issue_patch' require 'redmine_dmsf/patches/issue_patch'
@ -70,4 +69,4 @@ require 'redmine_dmsf/hooks/helpers/issues_helper_hooks'
require 'redmine_dmsf/hooks/helpers/search_helper_hooks' require 'redmine_dmsf/hooks/helpers/search_helper_hooks'
# Macros # Macros
require 'redmine_dmsf/macros' require 'redmine_dmsf/macros'

View File

@ -1,30 +0,0 @@
# Redmine plugin for Document Management System "Features"
#
# Copyright © 2011 Vít Jonáš <vit.jonas@gmail.com>
# Copyright © 2011-18 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 Redmine
module Acts
module Customizable
module InstanceMethods
def show_custom_field_values
custom_field_values.delete_if { |v| v.custom_field.blank? || v.value.blank? }
end
end
end
end
end

View File

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

View File

@ -47,9 +47,5 @@ module RedmineDmsf
end end
end end
if defined?(EasyExtensions) RedmineExtensions::PatchManager.register_concern_patch 'CustomFieldsHelper',
RedmineExtensions::PatchManager.register_helper_patch 'CustomFieldsHelper', 'RedmineDmsf::Patches::CustomFieldsHelperPatch', prepend: true
'RedmineDmsf::Patches::CustomFieldsHelperPatch', prepend: true
else
CustomFieldsHelper.send(:prepend, RedmineDmsf::Patches::CustomFieldsHelperPatch)
end

View File

@ -22,165 +22,159 @@ module RedmineDmsf
module Patches module Patches
module EasyCrmCasePatch module EasyCrmCasePatch
##################################################################################################################
# New methods
def self.included(base) def self.included(base)
base.send(:include, InstanceMethods)
base.class_eval do base.class_eval do
before_destroy :delete_system_folder before_destroy :delete_system_folder
end end
end end
module InstanceMethods def attributes_editable?
true
end
def attributes_editable? def save_dmsf_attachments(dmsf_attachments)
true @saved_dmsf_attachments = []
end if dmsf_attachments
dmsf_attachments = dmsf_attachments.map(&:last)
def save_dmsf_attachments(dmsf_attachments) dmsf_attachments.each do |dmsf_attachment|
@saved_dmsf_attachments = [] a = Attachment.find_by_token(dmsf_attachment[:token])
if dmsf_attachments @saved_dmsf_attachments << a if a
dmsf_attachments = dmsf_attachments.map(&:last)
dmsf_attachments.each do |dmsf_attachment|
a = Attachment.find_by_token(dmsf_attachment[:token])
@saved_dmsf_attachments << a if a
end
end end
end end
end
def saved_dmsf_attachments def saved_dmsf_attachments
@saved_dmsf_attachments || [] @saved_dmsf_attachments || []
end end
def save_dmsf_links(dmsf_links) def save_dmsf_links(dmsf_links)
@saved_dmsf_links = [] @saved_dmsf_links = []
if dmsf_links if dmsf_links
ids = dmsf_links.map(&:last) ids = dmsf_links.map(&:last)
ids.each do |id| ids.each do |id|
l = DmsfLink.find_by_id(id) l = DmsfLink.find_by_id(id)
@saved_dmsf_links << l if l @saved_dmsf_links << l if l
end
end end
end end
end
def saved_dmsf_links def saved_dmsf_links
@saved_dmsf_links || [] @saved_dmsf_links || []
end end
def save_dmsf_attachments_wfs(dmsf_attachments_wfs, dmsf_attachments) def save_dmsf_attachments_wfs(dmsf_attachments_wfs, dmsf_attachments)
if dmsf_attachments_wfs if dmsf_attachments_wfs
@dmsf_attachments_wfs = {} @dmsf_attachments_wfs = {}
dmsf_attachments_wfs.each do |attachment_id, approval_workflow_id| dmsf_attachments_wfs.each do |attachment_id, approval_workflow_id|
attachment = dmsf_attachments[attachment_id] attachment = dmsf_attachments[attachment_id]
if attachment if attachment
a = Attachment.find_by_token(attachment[:token]) a = Attachment.find_by_token(attachment[:token])
wf = DmsfWorkflow.find_by_id approval_workflow_id
@dmsf_attachments_wfs[a.id] = wf if wf && a
end
end
end
end
def saved_dmsf_attachments_wfs
@dmsf_attachments_wfs || []
end
def save_dmsf_links_wfs(dmsf_links_wfs)
if dmsf_links_wfs
@saved_dmsf_links_wfs = {}
dmsf_links_wfs.each do |dmsf_link_id, approval_workflow_id|
wf = DmsfWorkflow.find_by_id approval_workflow_id wf = DmsfWorkflow.find_by_id approval_workflow_id
@saved_dmsf_links_wfs[dmsf_link_id.to_i] = wf if wf @dmsf_attachments_wfs[a.id] = wf if wf && a
end end
end end
end end
end
def saved_dmsf_links_wfs def saved_dmsf_attachments_wfs
@saved_dmsf_links_wfs || {} @dmsf_attachments_wfs || []
end end
def system_folder(create = false) def save_dmsf_links_wfs(dmsf_links_wfs)
parent = DmsfFolder.system.where(:project_id => self.project_id, :title => '.CRM cases').first if dmsf_links_wfs
if create && !parent @saved_dmsf_links_wfs = {}
parent = DmsfFolder.new dmsf_links_wfs.each do |dmsf_link_id, approval_workflow_id|
parent.project_id = self.project_id wf = DmsfWorkflow.find_by_id approval_workflow_id
parent.title = '.CRM cases' @saved_dmsf_links_wfs[dmsf_link_id.to_i] = wf if wf
parent.description = 'Documents assigned to CRM cases'
parent.user_id = User.anonymous.id
parent.system = true
parent.save
end
if parent
folder = DmsfFolder.system.where(['project_id = ? AND dmsf_folder_id = ? AND CAST(title AS DECIMAL) = ?',
self.project_id, parent.id, self.id]).first
if create && !folder
folder = DmsfFolder.new
folder.dmsf_folder_id = parent.id
folder.project_id = self.project_id
folder.title = "#{self.id} - #{self.name}"
folder.user_id = User.anonymous.id
folder.system = true
folder.save
end
end
folder
end
def dmsf_files
files = []
folder = self.system_folder
if folder
files = folder.dmsf_files.to_a
end
files
end
def dmsf_links
links = []
folder = self.system_folder
if folder
links = folder.dmsf_links
end
links
end
def delete_system_folder
folder = self.system_folder
folder.destroy if folder
end
def dmsf_file_added(dmsf_file)
unless dmsf_file.new_record?
self.journalize_dmsf_file(dmsf_file, :added)
end end
end end
end
def dmsf_file_removed(dmsf_file) def saved_dmsf_links_wfs
unless dmsf_file.new_record? @saved_dmsf_links_wfs || {}
self.journalize_dmsf_file(dmsf_file, :removed) end
def system_folder(create = false)
parent = DmsfFolder.system.where(:project_id => self.project_id, :title => '.CRM cases').first
if create && !parent
parent = DmsfFolder.new
parent.project_id = self.project_id
parent.title = '.CRM cases'
parent.description = 'Documents assigned to CRM cases'
parent.user_id = User.anonymous.id
parent.system = true
parent.save
end
if parent
folder = DmsfFolder.system.where(['project_id = ? AND dmsf_folder_id = ? AND CAST(title AS DECIMAL) = ?',
self.project_id, parent.id, self.id]).first
if create && !folder
folder = DmsfFolder.new
folder.dmsf_folder_id = parent.id
folder.project_id = self.project_id
folder.title = "#{self.id} - #{self.name}"
folder.user_id = User.anonymous.id
folder.system = true
folder.save
end end
end end
folder
end
# Adds a journal detail for an attachment that was added or removed def dmsf_files
def journalize_dmsf_file(dmsf_file, added_or_removed) files = []
init_journal(User.current) folder = self.system_folder
key = (added_or_removed == :removed ? :old_value : :value) if folder
current_journal.details << JournalDetail.new( files = folder.dmsf_files.to_a
:property => 'dmsf_file',
:prop_key => dmsf_file.id,
key => dmsf_file.title
)
current_journal.save
end end
files
end
def dmsf_links
links = []
folder = self.system_folder
if folder
links = folder.dmsf_links
end
links
end
def delete_system_folder
folder = self.system_folder
folder.destroy if folder
end
def dmsf_file_added(dmsf_file)
unless dmsf_file.new_record?
self.journalize_dmsf_file(dmsf_file, :added)
end
end
def dmsf_file_removed(dmsf_file)
unless dmsf_file.new_record?
self.journalize_dmsf_file(dmsf_file, :removed)
end
end
# Adds a journal detail for an attachment that was added or removed
def journalize_dmsf_file(dmsf_file, added_or_removed)
init_journal(User.current)
key = (added_or_removed == :removed ? :old_value : :value)
current_journal.details << JournalDetail.new(
:property => 'dmsf_file',
:prop_key => dmsf_file.id,
key => dmsf_file.title
)
current_journal.save
end end
end end
end end
end end
if Redmine::Plugin.installed?(:easy_crm) RedmineExtensions::PatchManager.register_model_patch 'EasyCrmCasePatch',
Rails.configuration.to_prepare do 'RedmineDmsf::Patches::RedmineDmsf::Patches::EasyCrmCasePatch',
unless EasyCrmCase.included_modules.include?(RedmineDmsf::Patches::EasyCrmCasePatch) if: proc { Redmine::Plugin.installed?(:easy_crm) }
EasyCrmCase.send(:include, RedmineDmsf::Patches::EasyCrmCasePatch)
end
end
end

View File

@ -118,4 +118,4 @@ end
RedmineExtensions::PatchManager.register_controller_patch 'EasyCrmCasesController', RedmineExtensions::PatchManager.register_controller_patch 'EasyCrmCasesController',
'RedmineDmsf::Patches::EasyCrmCasesControllerPatch', prepend: true, 'RedmineDmsf::Patches::EasyCrmCasesControllerPatch', prepend: true,
if: proc { Redmine::Plugin.installed?(:easy_crm) } if: proc { Redmine::Plugin.installed?(:easy_crm) }

View File

@ -22,152 +22,150 @@ module RedmineDmsf
module Patches module Patches
module IssuePatch module IssuePatch
##################################################################################################################
# New methods
def self.included(base) def self.included(base)
base.send(:include, InstanceMethods)
base.class_eval do base.class_eval do
before_destroy :delete_system_folder before_destroy :delete_system_folder
end end
end end
module InstanceMethods def save_dmsf_attachments(dmsf_attachments)
@saved_dmsf_attachments = []
def save_dmsf_attachments(dmsf_attachments) if dmsf_attachments
@saved_dmsf_attachments = [] dmsf_attachments = dmsf_attachments.map(&:last)
if dmsf_attachments dmsf_attachments.each do |dmsf_attachment|
dmsf_attachments = dmsf_attachments.map(&:last) a = Attachment.find_by_token(dmsf_attachment[:token])
dmsf_attachments.each do |dmsf_attachment| @saved_dmsf_attachments << a if a
a = Attachment.find_by_token(dmsf_attachment[:token])
@saved_dmsf_attachments << a if a
end
end end
end end
end
def saved_dmsf_attachments def saved_dmsf_attachments
@saved_dmsf_attachments || [] @saved_dmsf_attachments || []
end end
def save_dmsf_links(dmsf_links) def save_dmsf_links(dmsf_links)
@saved_dmsf_links = [] @saved_dmsf_links = []
if dmsf_links if dmsf_links
ids = dmsf_links.map(&:last) ids = dmsf_links.map(&:last)
ids.each do |id| ids.each do |id|
l = DmsfLink.find_by_id(id) l = DmsfLink.find_by_id(id)
@saved_dmsf_links << l if l @saved_dmsf_links << l if l
end
end end
end end
end
def saved_dmsf_links def saved_dmsf_links
@saved_dmsf_links || [] @saved_dmsf_links || []
end end
def save_dmsf_attachments_wfs(dmsf_attachments_wfs, dmsf_attachments) def save_dmsf_attachments_wfs(dmsf_attachments_wfs, dmsf_attachments)
if dmsf_attachments_wfs if dmsf_attachments_wfs
@dmsf_attachments_wfs = {} @dmsf_attachments_wfs = {}
dmsf_attachments_wfs.each do |attachment_id, approval_workflow_id| dmsf_attachments_wfs.each do |attachment_id, approval_workflow_id|
attachment = dmsf_attachments[attachment_id] attachment = dmsf_attachments[attachment_id]
if attachment if attachment
a = Attachment.find_by_token(attachment[:token]) a = Attachment.find_by_token(attachment[:token])
wf = DmsfWorkflow.find_by_id approval_workflow_id
@dmsf_attachments_wfs[a.id] = wf if wf && a
end
end
end
end
def saved_dmsf_attachments_wfs
@dmsf_attachments_wfs || []
end
def save_dmsf_links_wfs(dmsf_links_wfs)
if dmsf_links_wfs
@saved_dmsf_links_wfs = {}
dmsf_links_wfs.each do |dmsf_link_id, approval_workflow_id|
wf = DmsfWorkflow.find_by_id approval_workflow_id wf = DmsfWorkflow.find_by_id approval_workflow_id
@saved_dmsf_links_wfs[dmsf_link_id.to_i] = wf if wf @dmsf_attachments_wfs[a.id] = wf if wf && a
end end
end end
end end
end
def saved_dmsf_links_wfs def saved_dmsf_attachments_wfs
@saved_dmsf_links_wfs || {} @dmsf_attachments_wfs || []
end end
def system_folder(create = false, prj_id = nil) def save_dmsf_links_wfs(dmsf_links_wfs)
prj_id ||= self.project_id if dmsf_links_wfs
parent = DmsfFolder.system.where(:project_id => prj_id, :title => '.Issues').first @saved_dmsf_links_wfs = {}
if create && !parent dmsf_links_wfs.each do |dmsf_link_id, approval_workflow_id|
parent = DmsfFolder.new wf = DmsfWorkflow.find_by_id approval_workflow_id
parent.project_id = prj_id @saved_dmsf_links_wfs[dmsf_link_id.to_i] = wf if wf
parent.title = '.Issues'
parent.description = 'Documents assigned to issues'
parent.user_id = User.anonymous.id
parent.system = true
parent.save
end
if parent
folder = DmsfFolder.system.where(["project_id = ? AND dmsf_folder_id = ? AND title LIKE '? - %'",
prj_id, parent.id, self.id]).first
if create && !folder
folder = DmsfFolder.new
folder.dmsf_folder_id = parent.id
folder.project_id = prj_id
folder.title = "#{self.id} - #{self.subject}"
folder.user_id = User.anonymous.id
folder.system = true
folder.save
end
end
folder
end
def dmsf_files
files = []
folder = self.system_folder
if folder
files = folder.dmsf_files.to_a
end
files
end
def dmsf_links
links = []
folder = self.system_folder
if folder
links = folder.dmsf_links
end
links
end
def delete_system_folder
folder = self.system_folder
folder.destroy if folder
end
def dmsf_file_added(dmsf_file)
unless dmsf_file.new_record?
self.journalize_dmsf_file(dmsf_file, :added)
end end
end end
end
def dmsf_file_removed(dmsf_file) def saved_dmsf_links_wfs
unless dmsf_file.new_record? @saved_dmsf_links_wfs || {}
self.journalize_dmsf_file(dmsf_file, :removed) end
def system_folder(create = false, prj_id = nil)
prj_id ||= self.project_id
parent = DmsfFolder.system.where(:project_id => prj_id, :title => '.Issues').first
if create && !parent
parent = DmsfFolder.new
parent.project_id = prj_id
parent.title = '.Issues'
parent.description = 'Documents assigned to issues'
parent.user_id = User.anonymous.id
parent.system = true
parent.save
end
if parent
folder = DmsfFolder.system.where(["project_id = ? AND dmsf_folder_id = ? AND title LIKE '? - %'",
prj_id, parent.id, self.id]).first
if create && !folder
folder = DmsfFolder.new
folder.dmsf_folder_id = parent.id
folder.project_id = prj_id
folder.title = "#{self.id} - #{self.subject}"
folder.user_id = User.anonymous.id
folder.system = true
folder.save
end end
end end
folder
end
# Adds a journal detail for an attachment that was added or removed def dmsf_files
def journalize_dmsf_file(dmsf_file, added_or_removed) files = []
init_journal(User.current) folder = self.system_folder
key = (added_or_removed == :removed ? :old_value : :value) if folder
current_journal.details << JournalDetail.new( files = folder.dmsf_files.to_a
:property => 'dmsf_file',
:prop_key => dmsf_file.id,
key => dmsf_file.title
)
current_journal.save
end end
files
end
def dmsf_links
links = []
folder = self.system_folder
if folder
links = folder.dmsf_links
end
links
end
def delete_system_folder
folder = self.system_folder
folder.destroy if folder
end
def dmsf_file_added(dmsf_file)
unless dmsf_file.new_record?
self.journalize_dmsf_file(dmsf_file, :added)
end
end
def dmsf_file_removed(dmsf_file)
unless dmsf_file.new_record?
self.journalize_dmsf_file(dmsf_file, :removed)
end
end
# Adds a journal detail for an attachment that was added or removed
def journalize_dmsf_file(dmsf_file, added_or_removed)
init_journal(User.current)
key = (added_or_removed == :removed ? :old_value : :value)
current_journal.details << JournalDetail.new(
:property => 'dmsf_file',
:prop_key => dmsf_file.id,
key => dmsf_file.title
)
current_journal.save
end end
end end
@ -175,8 +173,5 @@ module RedmineDmsf
end end
# Apply patch # Apply patch
Rails.configuration.to_prepare do RedmineExtensions::PatchManager.register_model_patch 'Issue',
unless Issue.included_modules.include?(RedmineDmsf::Patches::IssuePatch) 'RedmineDmsf::Patches::IssuePatch'
Issue.send(:include, RedmineDmsf::Patches::IssuePatch)
end
end

View File

@ -115,9 +115,5 @@ module RedmineDmsf
end end
end end
if defined?(EasyExtensions) RedmineExtensions::PatchManager.register_model_patch 'Project',
RedmineExtensions::PatchManager.register_model_patch 'Project', 'RedmineDmsf::Patches::ProjectPatch', prepend: true
'RedmineDmsf::Patches::ProjectPatch', prepend: true
else
Project.send(:prepend, RedmineDmsf::Patches::ProjectPatch)
end

View File

@ -20,7 +20,7 @@
module RedmineDmsf module RedmineDmsf
module Patches module Patches
module ProjectTabsExtended module ProjectHelperPatch
################################################################################################################## ##################################################################################################################
# Overridden methods # Overridden methods
@ -41,9 +41,5 @@ module RedmineDmsf
end end
end end
if defined?(EasyExtensions) RedmineExtensions::PatchManager.register_concern_patch 'ProjectsHelper',
RedmineExtensions::PatchManager.register_helper_patch 'ProjectsHelper', 'RedmineDmsf::Patches::ProjectHelperPatch', prepend: true
'RedmineDmsf::Patches::ProjectTabsExtended', prepend: true
else
ProjectsHelper.send(:prepend, RedmineDmsf::Patches::ProjectTabsExtended)
end

View File

@ -22,22 +22,20 @@ module RedmineDmsf
module Patches module Patches
module RolePatch module RolePatch
def self.included(base) # :nodoc: ##################################################################################################################
base.send(:include, InstanceMethods) # New methods
def self.included(base)
base.class_eval do base.class_eval do
before_destroy :remove_dmsf_references before_destroy :remove_dmsf_references
end end
end end
module InstanceMethods def remove_dmsf_references
return if self.id.nil?
def remove_dmsf_references substitute = Role.anonymous
return if self.id.nil? DmsfFolderPermission.where(:object_id => self.id, :object_type => 'Role').update_all(
substitute = Role.anonymous :object_id => substitute.id)
DmsfFolderPermission.where(:object_id => self.id, :object_type => 'Role').update_all(
:object_id => substitute.id)
end
end end
end end
@ -45,8 +43,5 @@ module RedmineDmsf
end end
# Apply patch # Apply patch
Rails.configuration.to_prepare do RedmineExtensions::PatchManager.register_model_patch 'Role',
unless Role.included_modules.include?(RedmineDmsf::Patches::RolePatch) 'RedmineDmsf::Patches::RolePatch', prepend: true
Role.send(:include, RedmineDmsf::Patches::RolePatch)
end
end

View File

@ -22,33 +22,31 @@ module RedmineDmsf
module Patches module Patches
module UserPatch module UserPatch
##################################################################################################################
# New methods
def self.included(base) # :nodoc: def self.included(base) # :nodoc:
base.send(:include, InstanceMethods)
base.class_eval do base.class_eval do
before_destroy :remove_dmsf_references before_destroy :remove_dmsf_references
end end
end end
module InstanceMethods def remove_dmsf_references
return if self.id.nil?
def remove_dmsf_references substitute = User.anonymous
return if self.id.nil? DmsfFileRevisionAccess.where(:user_id => id).update_all(:user_id => substitute.id)
substitute = User.anonymous DmsfFileRevision.where(:user_id => id).update_all(:user_id => substitute.id)
DmsfFileRevisionAccess.where(:user_id => id).update_all(:user_id => substitute.id) DmsfFile.where(:deleted_by_user_id => id).update_all(:deleted_by_user_id => substitute.id)
DmsfFileRevision.where(:user_id => id).update_all(:user_id => substitute.id) DmsfFolder.where(:user_id => id).update_all(:user_id => substitute.id)
DmsfFile.where(:deleted_by_user_id => id).update_all(:deleted_by_user_id => substitute.id) DmsfFolder.where(:deleted_by_user_id => id).update_all(:deleted_by_user_id => substitute.id)
DmsfFolder.where(:user_id => id).update_all(:user_id => substitute.id) DmsfLink.where(:user_id => id).update_all(:user_id => substitute.id)
DmsfFolder.where(:deleted_by_user_id => id).update_all(:deleted_by_user_id => substitute.id) DmsfLink.where(:deleted_by_user_id => id).update_all(:deleted_by_user_id => substitute.id)
DmsfLink.where(:user_id => id).update_all(:user_id => substitute.id) DmsfLock.where(:user_id => id).delete_all
DmsfLink.where(:deleted_by_user_id => id).update_all(:deleted_by_user_id => substitute.id) DmsfWorkflowStepAction.where(:author_id => id).update_all(:author_id => substitute.id)
DmsfLock.where(:user_id => id).delete_all DmsfWorkflowStepAssignment.where(:user_id => id).update_all(:user_id => substitute.id)
DmsfWorkflowStepAction.where(:author_id => id).update_all(:author_id => substitute.id) DmsfWorkflowStep.where(:user_id => id).update_all(:user_id => substitute.id)
DmsfWorkflowStepAssignment.where(:user_id => id).update_all(:user_id => substitute.id) DmsfWorkflow.where(:author_id => id).update_all(:author_id => substitute.id)
DmsfWorkflowStep.where(:user_id => id).update_all(:user_id => substitute.id) DmsfFolderPermission.where(:object_id => id, :object_type => 'User').update_all(:object_id => substitute.id)
DmsfWorkflow.where(:author_id => id).update_all(:author_id => substitute.id)
DmsfFolderPermission.where(:object_id => id, :object_type => 'User').update_all(:object_id => substitute.id)
end
end end
end end
@ -56,8 +54,5 @@ module RedmineDmsf
end end
# Apply patch # Apply patch
Rails.configuration.to_prepare do RedmineExtensions::PatchManager.register_model_patch 'User',
unless User.included_modules.include?(RedmineDmsf::Patches::UserPatch) 'RedmineDmsf::Patches::UserPatch'
User.send(:include, RedmineDmsf::Patches::UserPatch)
end
end

View File

@ -22,31 +22,29 @@ module RedmineDmsf
module Patches module Patches
module UserPreference module UserPreference
##################################################################################################################
# New methods
def self.included(base) def self.included(base)
base.send(:include, InstanceMethods)
base.class_eval do base.class_eval do
safe_attributes 'dmsf_tree_view', 'dmsf_attachments_upload_choice' if self.included_modules.include?(Redmine::SafeAttributes) safe_attributes 'dmsf_tree_view', 'dmsf_attachments_upload_choice' if self.included_modules.include?(Redmine::SafeAttributes)
end end
end end
module InstanceMethods def dmsf_tree_view
self[:dmsf_tree_view] || '1'
end
def dmsf_tree_view def dmsf_tree_view=(value)
self[:dmsf_tree_view] || '1' self[:dmsf_tree_view] = value
end end
def dmsf_tree_view=(value) def dmsf_attachments_upload_choice
self[:dmsf_tree_view] = value self[:dmsf_attachments_upload_choice] || 'DMSF'
end end
def dmsf_attachments_upload_choice
self[:dmsf_attachments_upload_choice] || 'DMSF'
end
def dmsf_attachments_upload_choice=(value)
self[:dmsf_attachments_upload_choice] = value
end
def dmsf_attachments_upload_choice=(value)
self[:dmsf_attachments_upload_choice] = value
end end
end end
@ -54,8 +52,5 @@ module RedmineDmsf
end end
# Apply patch # Apply patch
Rails.configuration.to_prepare do RedmineExtensions::PatchManager.register_model_patch 'UserPreference',
unless UserPreference.included_modules.include?(RedmineDmsf::Patches::UserPreference) 'RedmineDmsf::Patches::UserPreference'
UserPreference.send(:include, RedmineDmsf::Patches::UserPreference)
end
end