summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorPeter Kozak <spag@golwen.net>2013-02-27 06:05:06 -0500
committerPeter Kozak <spag@golwen.net>2013-02-27 06:05:06 -0500
commit211f558a86ae30cdd5b392ab1376e1393f97e22c (patch)
treef86ec6cedf081a1a57005eca1661e9bead34e4de /app/controllers
parented0117210837dd1d0d2dbf403799b70225caf0cd (diff)
parent41e17e9f3e184975e8b429d3fb06d822c49068bf (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/sip_accounts_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/sip_accounts_controller.rb b/app/controllers/sip_accounts_controller.rb
index ef1aab8..621bd3c 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, :only => [:call]
+ load_and_authorize_resource :sip_account, :only => [:call]
load_and_authorize_resource :sip_account, :through => [:user, :tenant ]
before_filter :set_and_authorize_parent