Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions core/app/models/workarea/user/password_reset.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,17 @@ def complete(new_password)
if user.update_attributes(password: new_password)
destroy
else
user.errors.each do |attribute, error|
errors.add(attribute, error)
# Rails 7 yields ActiveModel::Error objects; older Rails yields
# [attribute, message] pairs.
user.errors.each do |error|
if error.respond_to?(:attribute) && error.respond_to?(:message)
errors.add(error.attribute, error.message)
else
attribute, message = error
errors.add(attribute, message)
end
end

false
end
end
Expand Down
Loading