diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb index e61dfd39..de00bcd9 100644 --- a/app/models/dmsf_folder.rb +++ b/app/models/dmsf_folder.rb @@ -99,8 +99,6 @@ class DmsfFolder < ApplicationRecord validates :dmsf_folder, dmsf_folder_parent: true, if: proc { |folder| !folder.new_record? } before_create :default_values - before_destroy :delete_system_folder_before - after_destroy :delete_system_folder_after def visible?(_user = User.current) return DmsfFolder.visible.exists?(id: id) if respond_to?(:type) && /^folder/.match?(type) @@ -616,16 +614,6 @@ class DmsfFolder < ApplicationRecord false end - def delete_system_folder_before - @parent_folder = dmsf_folder - end - - def delete_system_folder_after - return unless @parent_folder&.system && @parent_folder.dmsf_files.empty? && @parent_folder.dmsf_links.empty? - - @parent_folder.destroy - end - class << self def directory_subtree(tree, folder, level) folders = folder.dmsf_folders.visible.to_a