From b13042effb94ec969565295f4daee3fe9a28505d Mon Sep 17 00:00:00 2001 From: "karel.picman@lbcfree.net" Date: Wed, 17 Mar 2021 10:31:06 +0100 Subject: [PATCH] 'errors[:base] <<' is deprecated --- app/controllers/dmsf_controller.rb | 4 ++-- app/controllers/dmsf_links_controller.rb | 2 +- app/models/dmsf_file.rb | 14 +++++++------- app/models/dmsf_file_revision.rb | 6 +++--- app/models/dmsf_folder.rb | 4 ++-- app/models/dmsf_link.rb | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb index 285abea8..ae02fd91 100644 --- a/app/controllers/dmsf_controller.rb +++ b/app/controllers/dmsf_controller.rb @@ -431,9 +431,9 @@ class DmsfController < ApplicationController dmsf_folder = DmsfFolder.find_by(id: $1) if dmsf_folder if dmsf_folder == object.dmsf_folder - object.errors[:base] << l(:error_target_folder_same) + object.errors.add(:base, l(:error_target_folder_same)) elsif object.dmsf_folder&.locked_for_user? - object.errors[:base] << l(:error_folder_is_locked) + object.errors.add(:base, l(:error_folder_is_locked)) else result = object.move_to(dmsf_folder.project, dmsf_folder) end diff --git a/app/controllers/dmsf_links_controller.rb b/app/controllers/dmsf_links_controller.rb index 8ea31dd1..4539c050 100644 --- a/app/controllers/dmsf_links_controller.rb +++ b/app/controllers/dmsf_links_controller.rb @@ -177,7 +177,7 @@ class DmsfLinksController < ApplicationController end end rescue => e - errors[:base] << e.message + errors.add(:base, e.message) return false end redirect_back_or_default dmsf_folder_path(id: @project, folder_id: @folder) diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb index 7115be00..56514f20 100644 --- a/app/models/dmsf_file.rb +++ b/app/models/dmsf_file.rb @@ -139,9 +139,9 @@ class DmsfFile < ActiveRecord::Base if locked_for_user? && (!User.current.allowed_to?(:force_file_unlock, project)) Rails.logger.info l(:error_file_is_locked) if lock.reverse[0].user - errors[:base] << l(:title_locked_by_user, user: lock.reverse[0].user) + errors.add(:base, l(:title_locked_by_user, user: lock.reverse[0].user)) else - errors[:base] << l(:error_file_is_locked) + errors.add(:base, l(:error_file_is_locked)) end return false end @@ -157,14 +157,14 @@ class DmsfFile < ActiveRecord::Base end rescue => e Rails.logger.error e.message - errors[:base] << e.message + errors.add(:base, e.message) return false end end def restore if dmsf_folder_id && (dmsf_folder.nil? || dmsf_folder.deleted?) - errors[:base] << l(:error_parent_folder) + errors.add(:base, l(:error_parent_folder)) return false end dmsf_file_revisions.each { |r| r.restore } @@ -236,12 +236,12 @@ class DmsfFile < ActiveRecord::Base def move_to(project, folder) if locked_for_user? - errors[:base] << l(:error_file_is_locked) + errors.add(:base, l(:error_file_is_locked)) Rails.logger.error l(:error_file_is_locked) return false end unless last_revision - errors[: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 @@ -314,7 +314,7 @@ class DmsfFile < ActiveRecord::Base if new_revision.save file.set_last_revision new_revision else - errors[:base] << new_revision.errors.full_messages.to_sentence + errors.add(:base, new_revision.errors.full_messages.to_sentence) Rails.logger.error new_revision.errors.full_messages.to_sentence file.delete(true) file = nil diff --git a/app/models/dmsf_file_revision.rb b/app/models/dmsf_file_revision.rb index 8c087c89..242eb9c6 100644 --- a/app/models/dmsf_file_revision.rb +++ b/app/models/dmsf_file_revision.rb @@ -100,11 +100,11 @@ class DmsfFileRevision < ActiveRecord::Base def delete(commit = false, force = true) if dmsf_file.locked_for_user? - errors[:base] << l(:error_file_is_locked) + errors.add(:base, l(:error_file_is_locked)) return false end if !commit && (!force && (dmsf_file.dmsf_file_revisions.length <= 1)) - errors[:base] << l(:error_at_least_one_revision_must_be_present) + errors.add(:base, l(:error_at_least_one_revision_must_be_present)) return false end @@ -119,7 +119,7 @@ class DmsfFileRevision < ActiveRecord::Base def obsolete if dmsf_file.locked_for_user? - errors[:base] << l(:error_file_is_locked) + errors.add(:base, l(:error_file_is_locked)) return false end self.workflow = DmsfWorkflow::STATE_OBSOLETE diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb index 6e835eb5..351ba636 100644 --- a/app/models/dmsf_folder.rb +++ b/app/models/dmsf_folder.rb @@ -140,7 +140,7 @@ class DmsfFolder < ActiveRecord::Base def delete(commit = false) if locked? - errors[:base] << l(:error_folder_is_locked) + errors.add(:base, l(:error_folder_is_locked)) return false end if commit @@ -165,7 +165,7 @@ class DmsfFolder < ActiveRecord::Base def restore if dmsf_folder&.deleted? - errors[:base] << l(:error_parent_folder) + errors.add(:base, l(:error_parent_folder)) return false end restore_recursively diff --git a/app/models/dmsf_link.rb b/app/models/dmsf_link.rb index 643c0ebc..1816b7d7 100644 --- a/app/models/dmsf_link.rb +++ b/app/models/dmsf_link.rb @@ -138,7 +138,7 @@ class DmsfLink < ActiveRecord::Base def restore if dmsf_folder_id && (dmsf_folder.nil? || dmsf_folder.deleted?) - errors[:base] << l(:error_parent_folder) + errors.add(:base, l(:error_parent_folder)) return false end self.deleted = STATUS_ACTIVE