From e680bb8aa0137ce41319130b8c1d036e88741924 Mon Sep 17 00:00:00 2001 From: "Karel.Picman" Date: Wed, 9 Feb 2022 14:50:36 +0100 Subject: [PATCH] Problem moving a folder with locked files. #1329 --- app/models/dmsf_file.rb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb index d5c81a16..ee890a44 100644 --- a/app/models/dmsf_file.rb +++ b/app/models/dmsf_file.rb @@ -252,17 +252,12 @@ class DmsfFile < ActiveRecord::Base end def move_to(project, folder) - if locked_for_user? - errors.add(:base, l(:error_file_is_locked)) - Rails.logger.error l(:error_file_is_locked) - return false - end unless last_revision - errors.add(:base, l(:error_at_least_one_revision_must_be_present)) + errors.add :base, l(:error_at_least_one_revision_must_be_present) Rails.logger.error l(:error_at_least_one_revision_must_be_present) return false end - source = "#{project.identifier}:#{dmsf_path_str}" + source = "#{self.project.identifier}:#{dmsf_path_str}" self.project = project self.dmsf_folder = folder new_revision = last_revision.clone