don't configure authentication_method if devise isn't used (fix #3467)

activeadmin · Oct 19, 2014 · c64176d · c64176d
1 parent 483661d
commit c64176d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/generators/active_admin/install/install_generator.rb b/lib/generators/active_admin/install/install_generator.rb
@@ -12,6 +12,7 @@ class InstallGenerator < ActiveRecord::Generators::Base
 
       def copy_initializer
         @underscored_user_name = name.underscore
+        @use_authentication_method = options[:users].present?
         template 'active_admin.rb.erb', 'config/initializers/active_admin.rb'
       end
 

diff --git a/lib/generators/active_admin/install/templates/active_admin.rb.erb b/lib/generators/active_admin/install/templates/active_admin.rb.erb
@@ -55,7 +55,7 @@ ActiveAdmin.setup do |config|
   #
   # This setting changes the method which Active Admin calls
   # within the application controller.
-  config.authentication_method = :authenticate_<%= @underscored_user_name %>!
+  <% unless @use_authentication_method %># <% end %>config.authentication_method = :authenticate_<%= @underscored_user_name %>!
 
   # == User Authorization
   #