working ember... again

This commit is contained in:
2013-10-07 23:00:01 +02:00
parent a8c01d264e
commit 2f41560591
46 changed files with 274 additions and 114 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
Qwaiter::Application.routes.draw do
devise_for :users
devise_for :users, controllers: { omniauth_callbacks: "users/omniauth_callbacks" }
devise_for :suppliers
devise_for :administrators
namespace :admin do
@@ -107,7 +107,7 @@ Qwaiter::Application.routes.draw do
get '/select_qrcode' => 'dashboard#select_qrcode'
get '/table_qr_image' => 'dashboard#table_qr_image', as: :table_qr_image
mount Cmtool::Engine => '/cmtool'
#mount Cmtool::Engine => '/cmtool'
#match "/:action", controller: 'dashboard'
# The priority is based upon order of creation: