From c04d602e7f3225f6d7b368a6e8eac7411ea8160c Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Wed, 6 Nov 2013 16:26:18 +0100 Subject: [PATCH] Now working --- app/assets/javascripts/user/quser.js.coffee | 2 +- app/assets/stylesheets/user/_constants.css.sass | 2 +- app/controllers/users/omniauth_callbacks_controller.rb | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/user/quser.js.coffee b/app/assets/javascripts/user/quser.js.coffee index 736f1470..3225dfb8 100644 --- a/app/assets/javascripts/user/quser.js.coffee +++ b/app/assets/javascripts/user/quser.js.coffee @@ -94,7 +94,7 @@ class Quser if(response.ok == false && response.status && response.status == 401) redirect_to('obtain_token') return - + $('.table-number').text(response.table_number) if response.table_number $('.supplier-name').text(response.supplier_name) if response.supplier_name diff --git a/app/assets/stylesheets/user/_constants.css.sass b/app/assets/stylesheets/user/_constants.css.sass index c77edd99..81bfc4a9 100644 --- a/app/assets/stylesheets/user/_constants.css.sass +++ b/app/assets/stylesheets/user/_constants.css.sass @@ -33,7 +33,7 @@ $side-spacing: 5px min-height: 61px height: 61px padding-left: 49px - padding-right: 53px + padding-right: 52px .button-bar-inner //+single-box-shadow(#000, 0px, 4px, 8px, 0px, true) background-color: white diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb index 2211104a..74140688 100644 --- a/app/controllers/users/omniauth_callbacks_controller.rb +++ b/app/controllers/users/omniauth_callbacks_controller.rb @@ -11,7 +11,8 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController if @user.persisted? flash[:notice] = I18n.t "devise.omniauth_callbacks.success", :kind => "Facebook" sign_in @user - redirect_to user_root_path, :event => :authentication, :current_user => @user + #redirect_to user_root_path, :event => :authentication, :current_user => @user # infinite loop + redirect_to user_obtain_token_path, :event => :authentication, :current_user => @user else session["devise.facebook_data"] = request.env["omniauth.auth"] redirect_to new_user_registration_url