Convert all session controllers directly under devise controller

This commit is contained in:
Priit Tark 2015-05-20 14:57:46 +03:00
parent db4727b8f7
commit c08dc9aae7
5 changed files with 15 additions and 20 deletions

View file

@ -1,14 +1,17 @@
class Admin::SessionsController < SessionsController class Admin::SessionsController < Devise::SessionsController
skip_authorization_check only: :create
layout 'admin/application' layout 'admin/application'
def create
super
end
def login def login
end end
def find_user_by_idc(idc) # def create
AdminUser.find_by(identity_code: idc) # @user = AdminUser.first if params[:user1]
end # @user = AdminUser.second if params[:user2]
# return redirect_to :back, alert: 'No user' if @user.blank?
# flash[:notice] = I18n.t('welcome')
# sign_in_and_redirect @user, event: :authentication
# end
end end

View file

@ -1,4 +1,4 @@
class Registrant::SessionsController < ::SessionsController class Registrant::SessionsController < Devise::SessionsController
layout 'registrant/application' layout 'registrant/application'
helper_method :depp_controller? helper_method :depp_controller?
def depp_controller? def depp_controller?

View file

@ -1,4 +1,4 @@
class Registrar::SessionsController < ::SessionsController class Registrar::SessionsController < Devise::SessionsController
layout 'registrar/application' layout 'registrar/application'
helper_method :depp_controller? helper_method :depp_controller?
def depp_controller? def depp_controller?

View file

@ -14,7 +14,7 @@ Devise.setup do |config|
# Configure the e-mail address which will be shown in Devise::Mailer, # Configure the e-mail address which will be shown in Devise::Mailer,
# note that it will be overwritten if you use your own mailer class # note that it will be overwritten if you use your own mailer class
# with default "from" parameter. # with default "from" parameter.
config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' config.mailer_sender = 'noreply@example.com'
# Configure the class responsible to send e-mails. # Configure the class responsible to send e-mails.
# config.mailer = 'Devise::Mailer' # config.mailer = 'Devise::Mailer'
@ -210,7 +210,7 @@ Devise.setup do |config|
# Turn scoped views on. Before rendering "sessions/new", it will first check for # Turn scoped views on. Before rendering "sessions/new", it will first check for
# "users/sessions/new". It's turned off by default because it's slower if you # "users/sessions/new". It's turned off by default because it's slower if you
# are using only default views. # are using only default views.
# config.scoped_views = false config.scoped_views = true
# Configure the default scope given to Warden. By default it's the first # Configure the default scope given to Warden. By default it's the first
# devise role declared in your routes (usually :user). # devise role declared in your routes (usually :user).

View file

@ -217,11 +217,7 @@ Rails.application.routes.draw do
devise_scope :user do devise_scope :user do
get 'login' => 'sessions#login' get 'login' => 'sessions#login'
# get 'login/mid' => 'sessions#login_mid'
# post 'login/mid' => 'sessions#mid'
post 'sessions' => 'sessions#create' post 'sessions' => 'sessions#create'
post 'mid' => 'sessions#mid'
get 'logout' => '/devise/sessions#destroy' get 'logout' => '/devise/sessions#destroy'
end end
@ -230,9 +226,5 @@ Rails.application.routes.draw do
devise_for :users devise_for :users
devise_scope :user do
get 'login' => 'admin/sessions#login'
end
root to: redirect('admin/login') root to: redirect('admin/login')
end end