bterkuile/mozo-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Now working

Browse Source
This commit is contained in:
Benjamin ter Kuile
2013-11-06 16:26:18 +01:00
parent 0928961423
commit c04d602e7f
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/user/quser.js.coffee
+1 -1
View File
@@ -94,7 +94,7 @@ class Quser
if(response.ok == false && response.status && response.status == 401) if(response.ok == false && response.status && response.status == 401)
redirect_to('obtain_token') redirect_to('obtain_token')
return return
$('.table-number').text(response.table_number) if response.table_number $('.table-number').text(response.table_number) if response.table_number
$('.supplier-name').text(response.supplier_name) if response.supplier_name $('.supplier-name').text(response.supplier_name) if response.supplier_name
app/assets/stylesheets/user/_constants.css.sass
+1 -1
View File
@@ -33,7 +33,7 @@ $side-spacing: 5px
min-height: 61px min-height: 61px
height: 61px height: 61px
padding-left: 49px padding-left: 49px
padding-right: 53px padding-right: 52px
.button-bar-inner .button-bar-inner
//+single-box-shadow(#000, 0px, 4px, 8px, 0px, true) //+single-box-shadow(#000, 0px, 4px, 8px, 0px, true)
background-color: white background-color: white
app/controllers/users/omniauth_callbacks_controller.rb
+2 -1
View File
@@ -11,7 +11,8 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
if @user.persisted? if @user.persisted?
flash[:notice] = I18n.t "devise.omniauth_callbacks.success", :kind => "Facebook" flash[:notice] = I18n.t "devise.omniauth_callbacks.success", :kind => "Facebook"
sign_in @user 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 else
session["devise.facebook_data"] = request.env["omniauth.auth"] session["devise.facebook_data"] = request.env["omniauth.auth"]
redirect_to new_user_registration_url redirect_to new_user_registration_url