diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/sip_accounts_controller.rb | 33 | ||||
| -rw-r--r-- | app/models/ability.rb | 2 |
2 files changed, 2 insertions, 33 deletions
diff --git a/app/controllers/sip_accounts_controller.rb b/app/controllers/sip_accounts_controller.rb index 621bd3c..b34172d 100644 --- a/app/controllers/sip_accounts_controller.rb +++ b/app/controllers/sip_accounts_controller.rb @@ -1,7 +1,6 @@ class SipAccountsController < ApplicationController load_resource :user load_resource :tenant - load_and_authorize_resource :sip_account, :only => [:call] load_and_authorize_resource :sip_account, :through => [:user, :tenant ] before_filter :set_and_authorize_parent @@ -11,7 +10,7 @@ class SipAccountsController < ApplicationController end def show - @register_tel_protocol = "#{request.protocol}#{request.host_with_port}/sip_accounts/#{@sip_account.try(:id)}/call?url=%s" + @register_tel_protocol = "#{request.protocol}#{request.host_with_port}/sip_accounts/#{@sip_account.try(:id)}/calls/new?url=%s" end def new @@ -76,36 +75,6 @@ class SipAccountsController < ApplicationController redirect_to :root, :notice => t('sip_accounts.controller.successfuly_destroyed') end - def call - if !params[:url].blank? - protocol, separator, phone_number = params[:url].partition(':') - if ! phone_number.blank? - @sip_account.call(phone_number) - render( - :status => 200, - :layout => false, - :content_type => 'text/plain', - :text => "<!-- CALL -->", - ) - return; - end - render( - :status => 404, - :layout => false, - :content_type => 'text/plain', - :text => "<!-- Number not found -->", - ) - return; - end - - render( - :status => 404, - :layout => false, - :content_type => 'text/plain', - :text => "<!-- Call URL not found -->", - ) - end - private def set_and_authorize_parent @parent = @user || @tenant diff --git a/app/models/ability.rb b/app/models/ability.rb index 3ba4481..48cce84 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -131,7 +131,7 @@ class Ability # SipAccounts and Phones # - can [:read, :call], SipAccount, :sip_accountable_type => 'User', :sip_accountable_id => user.id + can :read, SipAccount, :sip_accountable_type => 'User', :sip_accountable_id => user.id user.sip_accounts.each do |sip_account| can :read, PhoneNumber, :id => sip_account.phone_number_ids can :manage, CallForward, :call_forwardable_id => sip_account.phone_number_ids |