Merge pull request #2062 from jvortmann/fix_logout_path_and_method

Fix #1386 by removing dependency of Devise for logout_path and logout_method.

Author: sferik

app/helpers/rails_admin/application_helper.rb

@@ -31,9 +31,17 @@ def edit_user_link
     end
 
     def logout_path
-      return unless defined?(Devise)
-      scope = Devise::Mapping.find_scope!(_current_user)
-      main_app.send("destroy_#{scope}_session_path") rescue false
+      if defined?(Devise)
+        scope = Devise::Mapping.find_scope!(_current_user)
+        main_app.send("destroy_#{scope}_session_path") rescue false
+      else
+        main_app.logout_path if main_app.respond_to?(:logout_path)
+      end
+    end
+
+    def logout_method
+      return Devise.sign_out_via if defined?(Devise)
+      :delete
     end
 
     def wording_for(label, action = @action, abstract_model = @abstract_model, object = @object)

app/views/layouts/rails_admin/_secondary_navigation.html.haml

@@ -7,6 +7,6 @@
     - if user_link = edit_user_link
       %li= user_link
     - if logout_path.present?
-      %li= link_to content_tag('span', t('admin.misc.log_out'), class: 'label label-important'), logout_path, method: Devise.sign_out_via
+      %li= link_to content_tag('span', t('admin.misc.log_out'), class: 'label label-important'), logout_path, method: logout_method
     - if _current_user.respond_to?(:email) && _current_user.email.present?
       %li= image_tag "#{(request.ssl? ? 'https://secure' : 'http://www')}.gravatar.com/avatar/#{Digest::MD5.hexdigest _current_user.email}?s=30", style: 'padding-top:5px'