Permalink
Browse files

Clean up as we don't need to call render_with_scope anymore.

  • Loading branch information...
1 parent d9df632 commit 66b93e8fd226083bca8df8ebdbfbfe370cc6cb72 @josevalim josevalim committed Jan 2, 2012
@@ -2,7 +2,6 @@ class Devise::ConfirmationsController < DeviseController
# GET /resource/confirmation/new
def new
build_resource({})
- render :new
end
# POST /resource/confirmation
@@ -12,7 +11,7 @@ def create
if successfully_sent?(resource)
respond_with({}, :location => after_resending_confirmation_instructions_path_for(resource_name))
else
- respond_with_navigational(resource){ render :new }
+ respond_with(resource)
end
end
@@ -4,7 +4,6 @@ class Devise::PasswordsController < DeviseController
# GET /resource/password/new
def new
build_resource({})
- render :new
end
# POST /resource/password
@@ -14,15 +13,14 @@ def create
if successfully_sent?(resource)
respond_with({}, :location => after_sending_reset_password_instructions_path_for(resource_name))
else
- respond_with_navigational(resource){ render :new }
+ respond_with(resource)
end
end
# GET /resource/password/edit?reset_password_token=abcdef
def edit
self.resource = resource_class.new
resource.reset_password_token = params[:reset_password_token]
- render :edit
end
# PUT /resource/password
@@ -35,7 +33,7 @@ def update
sign_in(resource_name, resource)
respond_with resource, :location => after_sign_in_path_for(resource)
else
- respond_with_navigational(resource){ render :edit }
+ respond_with resource
end
end
@@ -5,7 +5,7 @@ class Devise::RegistrationsController < DeviseController
# GET /resource/sign_up
def new
resource = build_resource({})
- respond_with_navigational(resource){ render :new }
+ respond_with resource
end
# POST /resource
@@ -23,8 +23,8 @@ def create
respond_with resource, :location => after_inactive_sign_up_path_for(resource)
end
else
- clean_up_passwords(resource)
- respond_with_navigational(resource) { render :new }
+ clean_up_passwords resource
+ respond_with resource
end
end
@@ -49,8 +49,8 @@ def update
sign_in resource_name, resource, :bypass => true
respond_with resource, :location => after_update_path_for(resource)
else
- clean_up_passwords(resource)
- respond_with_navigational(resource){ render :edit }
+ clean_up_passwords resource
+ respond_with resource
end
end
@@ -6,7 +6,7 @@ class Devise::SessionsController < DeviseController
def new
resource = build_resource
clean_up_passwords(resource)
- respond_with_navigational(resource, stub_options(resource)){ render :new }
+ respond_with(resource, stub_options(resource))
end
# POST /resource/sign_in
@@ -4,7 +4,6 @@ class Devise::UnlocksController < DeviseController
# GET /resource/unlock/new
def new
build_resource({})
- render :new
end
# POST /resource/unlock
@@ -14,7 +13,7 @@ def create
if successfully_sent?(resource)
respond_with({}, :location => new_session_path(resource_name))
else
- respond_with_navigational(resource){ render :new }
+ respond_with(resource)
end
end

0 comments on commit 66b93e8

Please sign in to comment.