From e1ef430f53487b2db432488ebfe1ef57f255f7df Mon Sep 17 00:00:00 2001 From: Karel Picman Date: Tue, 16 Jan 2018 09:23:38 +0100 Subject: [PATCH] unloadable is no more needed refs Redmine#20513 --- app/controllers/dmsf_controller.rb | 1 - app/controllers/dmsf_files_controller.rb | 1 - app/controllers/dmsf_files_copy_controller.rb | 1 - app/controllers/dmsf_folder_permissions_controller.rb | 1 - app/controllers/dmsf_folders_copy_controller.rb | 1 - app/controllers/dmsf_links_controller.rb | 1 - app/controllers/dmsf_public_urls_controller.rb | 1 - app/controllers/dmsf_state_controller.rb | 1 - app/controllers/dmsf_upload_controller.rb | 1 - app/controllers/dmsf_workflows_controller.rb | 2 +- app/models/dmsf_file.rb | 1 - app/models/dmsf_file_revision.rb | 1 - app/models/dmsf_file_revision_access.rb | 1 - app/models/dmsf_folder.rb | 1 - app/models/dmsf_folder_permission.rb | 1 - app/models/dmsf_link.rb | 2 +- app/models/dmsf_public_url.rb | 2 +- lib/redmine_dmsf/patches/easy_crm_case_patch.rb | 1 - lib/redmine_dmsf/patches/issue_patch.rb | 1 - lib/redmine_dmsf/patches/role_patch.rb | 1 - lib/redmine_dmsf/patches/user_patch.rb | 2 -- 21 files changed, 3 insertions(+), 22 deletions(-) diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb index 436f4da3..98b2a3a8 100644 --- a/app/controllers/dmsf_controller.rb +++ b/app/controllers/dmsf_controller.rb @@ -22,7 +22,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class DmsfController < ApplicationController - unloadable before_action :find_project before_action :authorize, :except => [:expand_folder] diff --git a/app/controllers/dmsf_files_controller.rb b/app/controllers/dmsf_files_controller.rb index 784f5751..a0340024 100644 --- a/app/controllers/dmsf_files_controller.rb +++ b/app/controllers/dmsf_files_controller.rb @@ -20,7 +20,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class DmsfFilesController < ApplicationController - unloadable menu_item :dmsf diff --git a/app/controllers/dmsf_files_copy_controller.rb b/app/controllers/dmsf_files_copy_controller.rb index ae18854b..d42556e4 100644 --- a/app/controllers/dmsf_files_copy_controller.rb +++ b/app/controllers/dmsf_files_copy_controller.rb @@ -18,7 +18,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class DmsfFilesCopyController < ApplicationController - unloadable menu_item :dmsf diff --git a/app/controllers/dmsf_folder_permissions_controller.rb b/app/controllers/dmsf_folder_permissions_controller.rb index 2b483598..eafe2446 100644 --- a/app/controllers/dmsf_folder_permissions_controller.rb +++ b/app/controllers/dmsf_folder_permissions_controller.rb @@ -19,7 +19,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class DmsfFolderPermissionsController < ApplicationController - unloadable before_action :find_folder, :only => [:destroy] before_action :find_project diff --git a/app/controllers/dmsf_folders_copy_controller.rb b/app/controllers/dmsf_folders_copy_controller.rb index 1db820b3..7d7d2bbd 100644 --- a/app/controllers/dmsf_folders_copy_controller.rb +++ b/app/controllers/dmsf_folders_copy_controller.rb @@ -18,7 +18,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class DmsfFoldersCopyController < ApplicationController - unloadable menu_item :dmsf diff --git a/app/controllers/dmsf_links_controller.rb b/app/controllers/dmsf_links_controller.rb index a6162211..a94e0341 100644 --- a/app/controllers/dmsf_links_controller.rb +++ b/app/controllers/dmsf_links_controller.rb @@ -19,7 +19,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class DmsfLinksController < ApplicationController - unloadable model_object DmsfLink before_action :find_model_object, :only => [:destroy, :restore] diff --git a/app/controllers/dmsf_public_urls_controller.rb b/app/controllers/dmsf_public_urls_controller.rb index eab00f5c..b7e91a7e 100644 --- a/app/controllers/dmsf_public_urls_controller.rb +++ b/app/controllers/dmsf_public_urls_controller.rb @@ -19,7 +19,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class DmsfPublicUrlsController < ApplicationController - unloadable model_object DmsfPublicUrl before_action :authorize, :only => [:create] diff --git a/app/controllers/dmsf_state_controller.rb b/app/controllers/dmsf_state_controller.rb index cee02843..5db9acf8 100644 --- a/app/controllers/dmsf_state_controller.rb +++ b/app/controllers/dmsf_state_controller.rb @@ -20,7 +20,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class DmsfStateController < ApplicationController - unloadable menu_item :dmsf diff --git a/app/controllers/dmsf_upload_controller.rb b/app/controllers/dmsf_upload_controller.rb index 0f28a356..1a8c3891 100644 --- a/app/controllers/dmsf_upload_controller.rb +++ b/app/controllers/dmsf_upload_controller.rb @@ -20,7 +20,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class DmsfUploadController < ApplicationController - unloadable menu_item :dmsf diff --git a/app/controllers/dmsf_workflows_controller.rb b/app/controllers/dmsf_workflows_controller.rb index 593ec953..df8f8a7e 100644 --- a/app/controllers/dmsf_workflows_controller.rb +++ b/app/controllers/dmsf_workflows_controller.rb @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class DmsfWorkflowsController < ApplicationController - unloadable + model_object DmsfWorkflow before_action :find_model_object, :except => [:create, :new, :index, :assign, :assignment] diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb index 76228ab2..fa87155f 100644 --- a/app/models/dmsf_file.rb +++ b/app/models/dmsf_file.rb @@ -29,7 +29,6 @@ rescue LoadError end class DmsfFile < ActiveRecord::Base - unloadable include RedmineDmsf::Lockable diff --git a/app/models/dmsf_file_revision.rb b/app/models/dmsf_file_revision.rb index 7b56b6cb..374d3c97 100644 --- a/app/models/dmsf_file_revision.rb +++ b/app/models/dmsf_file_revision.rb @@ -23,7 +23,6 @@ require 'digest' class DmsfFileRevision < ActiveRecord::Base - unloadable belongs_to :dmsf_file belongs_to :source_revision, :class_name => 'DmsfFileRevision', :foreign_key => 'source_dmsf_file_revision_id' belongs_to :user diff --git a/app/models/dmsf_file_revision_access.rb b/app/models/dmsf_file_revision_access.rb index a2189aad..938bbbe4 100644 --- a/app/models/dmsf_file_revision_access.rb +++ b/app/models/dmsf_file_revision_access.rb @@ -21,7 +21,6 @@ class DmsfFileRevisionAccess < ActiveRecord::Base - unloadable belongs_to :dmsf_file_revision belongs_to :user delegate :dmsf_file, :to => :dmsf_file_revision, :allow_nil => false diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb index 77b5d5e4..0e4cacb9 100644 --- a/app/models/dmsf_folder.rb +++ b/app/models/dmsf_folder.rb @@ -21,7 +21,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class DmsfFolder < ActiveRecord::Base - unloadable include RedmineDmsf::Lockable diff --git a/app/models/dmsf_folder_permission.rb b/app/models/dmsf_folder_permission.rb index 0c3d86ab..152f41a5 100644 --- a/app/models/dmsf_folder_permission.rb +++ b/app/models/dmsf_folder_permission.rb @@ -19,7 +19,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class DmsfFolderPermission < ActiveRecord::Base - unloadable belongs_to :dmsf_folder diff --git a/app/models/dmsf_link.rb b/app/models/dmsf_link.rb index cba58487..7a6875e5 100644 --- a/app/models/dmsf_link.rb +++ b/app/models/dmsf_link.rb @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class DmsfLink < ActiveRecord::Base - unloadable + include ActiveModel::Validations belongs_to :project diff --git a/app/models/dmsf_public_url.rb b/app/models/dmsf_public_url.rb index 222bb3fe..1721801d 100644 --- a/app/models/dmsf_public_url.rb +++ b/app/models/dmsf_public_url.rb @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class DmsfPublicUrl < ActiveRecord::Base - unloadable + include ActiveModel::Validations belongs_to :dmsf_file diff --git a/lib/redmine_dmsf/patches/easy_crm_case_patch.rb b/lib/redmine_dmsf/patches/easy_crm_case_patch.rb index 1b979328..a9829476 100644 --- a/lib/redmine_dmsf/patches/easy_crm_case_patch.rb +++ b/lib/redmine_dmsf/patches/easy_crm_case_patch.rb @@ -25,7 +25,6 @@ module RedmineDmsf def self.included(base) base.send(:include, InstanceMethods) base.class_eval do - unloadable before_destroy :delete_system_folder end end diff --git a/lib/redmine_dmsf/patches/issue_patch.rb b/lib/redmine_dmsf/patches/issue_patch.rb index 836c1697..fe058d1f 100644 --- a/lib/redmine_dmsf/patches/issue_patch.rb +++ b/lib/redmine_dmsf/patches/issue_patch.rb @@ -25,7 +25,6 @@ module RedmineDmsf def self.included(base) base.send(:include, InstanceMethods) base.class_eval do - unloadable before_destroy :delete_system_folder end end diff --git a/lib/redmine_dmsf/patches/role_patch.rb b/lib/redmine_dmsf/patches/role_patch.rb index 4b760fbf..65cf32ac 100644 --- a/lib/redmine_dmsf/patches/role_patch.rb +++ b/lib/redmine_dmsf/patches/role_patch.rb @@ -25,7 +25,6 @@ module RedmineDmsf def self.included(base) # :nodoc: base.send(:include, InstanceMethods) base.class_eval do - unloadable before_destroy :remove_dmsf_references end end diff --git a/lib/redmine_dmsf/patches/user_patch.rb b/lib/redmine_dmsf/patches/user_patch.rb index e4d592f7..b294cbfb 100644 --- a/lib/redmine_dmsf/patches/user_patch.rb +++ b/lib/redmine_dmsf/patches/user_patch.rb @@ -25,8 +25,6 @@ module RedmineDmsf def self.included(base) # :nodoc: base.send(:include, InstanceMethods) base.class_eval do - unloadable - before_destroy :remove_dmsf_references end end