consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change the code to use what Devise does by default and update the tests

Browse Source
This commit is contained in:
Iraline
2022-05-09 18:14:12 -03:00
parent df15838e1f
commit 0195eac3fa
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/users/confirmations_controller.rb
View File

@@ -49,15 +49,12 @@ class Users::ConfirmationsController < Devise::ConfirmationsController
elsif resource.errors.empty?
set_official_position if resource.has_official_email?
if !resource.confirmed_at || resource.unconfirmed_email
resource.confirm # Last change: confirm happens here for people with passwords instead of af the top of the show action
message = :confirmed
if resource.confirm
set_flash_message(:notice, :confirmed) if is_flashing_format?
respond_with_navigational(resource) { redirect_to after_confirmation_path_for(resource_name, resource) }
else
message = :already_confirmed
respond_with_navigational(resource.errors, status: :unprocessable_entity) { render :new, status: :unprocessable_entity }
end
set_flash_message(:notice, message) if is_flashing_format?
respond_with_navigational(resource) { redirect_to after_confirmation_path_for(resource_name, resource) }
else
respond_with_navigational(resource.errors, status: :unprocessable_entity) { render :new }
end