diff options
author | Peter Kozak <spag@golwen.net> | 2013-02-26 16:17:05 -0500 |
---|---|---|
committer | Peter Kozak <spag@golwen.net> | 2013-02-26 16:17:05 -0500 |
commit | c175bbeec5c1573ba34da80cd1ec024e2be32b40 (patch) | |
tree | 28b6373dd4ffefa1897a0e91b67f19ec8fb2795f /app/controllers | |
parent | bc45716cb2aa3cd81ad5519edac8e09239a45984 (diff) | |
parent | 177a2c037468e222191b6668eb8e64a94833b18c (diff) |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/page_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/sip_accounts_controller.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/page_controller.rb b/app/controllers/page_controller.rb index ed48e3c..10ecf2c 100644 --- a/app/controllers/page_controller.rb +++ b/app/controllers/page_controller.rb @@ -7,6 +7,8 @@ class PageController < ApplicationController def index if current_user redirect_to [current_user.current_tenant, current_user] + else + redirect_to log_in_path end end diff --git a/app/controllers/sip_accounts_controller.rb b/app/controllers/sip_accounts_controller.rb index 022858c..ef1aab8 100644 --- a/app/controllers/sip_accounts_controller.rb +++ b/app/controllers/sip_accounts_controller.rb @@ -1,7 +1,7 @@ class SipAccountsController < ApplicationController load_resource :user load_resource :tenant - #load_resource :sip_account + load_resource :sip_account, :only => [:call] load_and_authorize_resource :sip_account, :through => [:user, :tenant ] before_filter :set_and_authorize_parent |