Fixed login redirection

Johpie · Nov 23, 2013 · 1af7ce9 · 1af7ce9
1 parent 8f375d7
commit 1af7ce9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/app/controllers/rich/cms_sessions_controller.rb b/app/controllers/rich/cms_sessions_controller.rb
@@ -1,16 +1,14 @@
 module Rich
   class CmsSessionsController < ::ApplicationController
     before_filter :allow_params_authentication!, :only => :login
+    layout false
 
     def login
       @success = Rich::Cms::Auth.login
 
-      if request.xhr?
-        respond_to do |format|
-          format.js
-        end
-      else
-        redirect_to "/"
+      respond_to do |format|
+        format.js
+        format.html { redirect_to "/" }
       end
     end
 

diff --git a/app/views/rich/cms_sessions/login.js.erb b/app/views/rich/cms_sessions/login.js.erb
@@ -1,5 +1,5 @@
 <% if @success %>
   window.location.reload();
 <% else %>
-  $("#<%= Rich::Cms::Auth.klass_symbol %>_<%= Rich::Cms::Auth.inputs.first %>").focus
+  $("#<%= Rich::Cms::Auth.klass_symbol %>_<%= Rich::Cms::Auth.inputs.first %>").trigger("focus");
 <% end %>