lib/active_admin/devise.rb in yousty-activeadmin-1.0.4.pre vs lib/active_admin/devise.rb in yousty-activeadmin-1.0.5.pre

- old
+ new

@@ -1,30 +1,28 @@ +ActiveAdmin::Dependency.devise! ActiveAdmin::Dependency::DEVISE + require 'devise' module ActiveAdmin module Devise def self.config - config = { - :path => ActiveAdmin.application.default_namespace, - :controllers => ActiveAdmin::Devise.controllers, - :path_names => { :sign_in => 'login', :sign_out => "logout" } + { + path: ActiveAdmin.application.default_namespace || "/", + controllers: ActiveAdmin::Devise.controllers, + path_names: { sign_in: 'login', sign_out: "logout" }, + sign_out_via: [*::Devise.sign_out_via, ActiveAdmin.application.logout_link_method].uniq } - - if ::Devise.respond_to?(:sign_out_via) - logout_methods = [::Devise.sign_out_via, ActiveAdmin.application.logout_link_method].flatten.uniq - config.merge!( :sign_out_via => logout_methods) - end - - config end def self.controllers { - :sessions => "active_admin/devise/sessions", - :passwords => "active_admin/devise/passwords", - :unlocks => "active_admin/devise/unlocks" + sessions: "active_admin/devise/sessions", + passwords: "active_admin/devise/passwords", + unlocks: "active_admin/devise/unlocks", + registrations: "active_admin/devise/registrations", + confirmations: "active_admin/devise/confirmations" } end module Controller extend ::ActiveSupport::Concern @@ -62,9 +60,23 @@ include ::ActiveAdmin::Devise::Controller end class UnlocksController < ::Devise::UnlocksController include ::ActiveAdmin::Devise::Controller + end + + class RegistrationsController < ::Devise::RegistrationsController + include ::ActiveAdmin::Devise::Controller + end + + class ConfirmationsController < ::Devise::ConfirmationsController + include ::ActiveAdmin::Devise::Controller + end + + def self.controllers_for_filters + [SessionsController, PasswordsController, UnlocksController, + RegistrationsController, ConfirmationsController + ] end end end