Ensure we are pointing to the proper sessions controller on failure.

This commit is contained in:
José Valim
2010-09-26 21:11:28 +02:00
parent ffaba3f1d3
commit ef3480004c
6 changed files with 17 additions and 17 deletions

View File

@@ -1,4 +1,4 @@
class SessionsController < Devise::SessionsController
class Admins::SessionsController < Devise::SessionsController
def new
flash[:special] = "Welcome to #{controller_path.inspect} controller!"
super

View File

@@ -19,7 +19,7 @@ Rails.application.routes.draw do
match "/sign_in", :to => "devise/sessions#new"
# Admin scope
devise_for :admin, :path => "admin_area", :controllers => { :sessions => "sessions" }, :skip => :passwords
devise_for :admin, :path => "admin_area", :controllers => { :sessions => "admins/sessions" }, :skip => :passwords
match "/admin_area/home", :to => "admins#index", :as => :admin_root
match "/anywhere", :to => "foo#bar", :as => :new_admin_password
@@ -29,7 +29,7 @@ Rails.application.routes.draw do
end
# Other routes for routing_test.rb
namespace :publisher, :path_names => { :sign_in => "i_don_care", :sign_out => "get_out" } do
namespace :publisher, :path_names => { :sign_in => "i_dont_care", :sign_out => "get_out" } do
devise_for :accounts, :class_name => "User", :path_names => { :sign_in => "get_in" }
end
@@ -43,10 +43,10 @@ Rails.application.routes.draw do
}
end
namespace :sign_out_via do
devise_for :deletes, :sign_out_via => :delete, :class_name => "User", :controllers => { :sessions => "sessions" }
devise_for :posts, :sign_out_via => :post, :class_name => "User", :controllers => { :sessions => "sessions" }
devise_for :delete_or_posts, :sign_out_via => [:delete, :post], :class_name => "User", :controllers => { :sessions => "sessions" }
namespace :sign_out_via, :module => "devise" do
devise_for :deletes, :sign_out_via => :delete, :class_name => "User"
devise_for :posts, :sign_out_via => :post, :class_name => "User"
devise_for :delete_or_posts, :sign_out_via => [:delete, :post], :class_name => "User"
end
match "/set", :to => "home#set"