'errors[:base] <<' is deprecated

This commit is contained in:
karel.picman@lbcfree.net 2021-03-17 10:31:06 +01:00
parent d71f820c8c
commit b13042effb
6 changed files with 16 additions and 16 deletions

View File

@ -431,9 +431,9 @@ class DmsfController < ApplicationController
dmsf_folder = DmsfFolder.find_by(id: $1) dmsf_folder = DmsfFolder.find_by(id: $1)
if dmsf_folder if dmsf_folder
if dmsf_folder == object.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? 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 else
result = object.move_to(dmsf_folder.project, dmsf_folder) result = object.move_to(dmsf_folder.project, dmsf_folder)
end end

View File

@ -177,7 +177,7 @@ class DmsfLinksController < ApplicationController
end end
end end
rescue => e rescue => e
errors[:base] << e.message errors.add(:base, e.message)
return false return false
end end
redirect_back_or_default dmsf_folder_path(id: @project, folder_id: @folder) redirect_back_or_default dmsf_folder_path(id: @project, folder_id: @folder)

View File

@ -139,9 +139,9 @@ class DmsfFile < ActiveRecord::Base
if locked_for_user? && (!User.current.allowed_to?(:force_file_unlock, project)) if locked_for_user? && (!User.current.allowed_to?(:force_file_unlock, project))
Rails.logger.info l(:error_file_is_locked) Rails.logger.info l(:error_file_is_locked)
if lock.reverse[0].user 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 else
errors[:base] << l(:error_file_is_locked) errors.add(:base, l(:error_file_is_locked))
end end
return false return false
end end
@ -157,14 +157,14 @@ class DmsfFile < ActiveRecord::Base
end end
rescue => e rescue => e
Rails.logger.error e.message Rails.logger.error e.message
errors[:base] << e.message errors.add(:base, e.message)
return false return false
end end
end end
def restore def restore
if dmsf_folder_id && (dmsf_folder.nil? || dmsf_folder.deleted?) 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 return false
end end
dmsf_file_revisions.each { |r| r.restore } dmsf_file_revisions.each { |r| r.restore }
@ -236,12 +236,12 @@ class DmsfFile < ActiveRecord::Base
def move_to(project, folder) def move_to(project, folder)
if locked_for_user? 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) Rails.logger.error l(:error_file_is_locked)
return false return false
end end
unless last_revision 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) Rails.logger.error l(:error_at_least_one_revision_must_be_present)
return false return false
end end
@ -314,7 +314,7 @@ class DmsfFile < ActiveRecord::Base
if new_revision.save if new_revision.save
file.set_last_revision new_revision file.set_last_revision new_revision
else 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 Rails.logger.error new_revision.errors.full_messages.to_sentence
file.delete(true) file.delete(true)
file = nil file = nil

View File

@ -100,11 +100,11 @@ class DmsfFileRevision < ActiveRecord::Base
def delete(commit = false, force = true) def delete(commit = false, force = true)
if dmsf_file.locked_for_user? if dmsf_file.locked_for_user?
errors[:base] << l(:error_file_is_locked) errors.add(:base, l(:error_file_is_locked))
return false return false
end end
if !commit && (!force && (dmsf_file.dmsf_file_revisions.length <= 1)) 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 return false
end end
@ -119,7 +119,7 @@ class DmsfFileRevision < ActiveRecord::Base
def obsolete def obsolete
if dmsf_file.locked_for_user? if dmsf_file.locked_for_user?
errors[:base] << l(:error_file_is_locked) errors.add(:base, l(:error_file_is_locked))
return false return false
end end
self.workflow = DmsfWorkflow::STATE_OBSOLETE self.workflow = DmsfWorkflow::STATE_OBSOLETE

View File

@ -140,7 +140,7 @@ class DmsfFolder < ActiveRecord::Base
def delete(commit = false) def delete(commit = false)
if locked? if locked?
errors[:base] << l(:error_folder_is_locked) errors.add(:base, l(:error_folder_is_locked))
return false return false
end end
if commit if commit
@ -165,7 +165,7 @@ class DmsfFolder < ActiveRecord::Base
def restore def restore
if dmsf_folder&.deleted? if dmsf_folder&.deleted?
errors[:base] << l(:error_parent_folder) errors.add(:base, l(:error_parent_folder))
return false return false
end end
restore_recursively restore_recursively

View File

@ -138,7 +138,7 @@ class DmsfLink < ActiveRecord::Base
def restore def restore
if dmsf_folder_id && (dmsf_folder.nil? || dmsf_folder.deleted?) 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 return false
end end
self.deleted = STATUS_ACTIVE self.deleted = STATUS_ACTIVE