kotovalexarian-likes-github
/
heartcombo--devise
mirror of https://github.com/heartcombo/devise.git
1
0
Fork 0
Code Releases Activity

Merge pull request #1796 from mkremer/feature/devise_redirects 

Added after_sending_reset_unlock_instructions_path_for
This commit is contained in:
Carlos Antonio da Silva 2012-04-22 05:44:50 -07:00
parent 3752981cfa 0e0bfe6686
commit 49873f4fea
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/controllers/devise/unlocks_controller.rb
View File

@ -11,7 +11,7 @@ class Devise::UnlocksController < DeviseController
self.resource = resource_class.send_unlock_instructions(params[resource_name])
if successfully_sent?(resource)
respond_with({}, :location => new_session_path(resource_name))
respond_with({}, :location => after_sending_reset_unlock_instructions_path_for(resource))
else
respond_with(resource)
end
@ -23,9 +23,22 @@ class Devise::UnlocksController < DeviseController
if resource.errors.empty?
set_flash_message :notice, :unlocked if is_navigational_format?
respond_with_navigational(resource){ redirect_to new_session_path(resource) }
respond_with_navigational(resource){ redirect_to after_unlock_path_for(resource) }
else
respond_with_navigational(resource.errors, :status => :unprocessable_entity){ render :new }
end
end
protected
# The path used after sending unlock password instructions
def after_sending_reset_unlock_instructions_path_for(resource)
new_session_path(resource)
end
# The path used after unlocking the resource
def after_unlock_path_for(resource)
new_session_path(resource)
end
end