From 477fcf8bce7dff84bb11fa79a4ad4f106d1ec8ad Mon Sep 17 00:00:00 2001 From: Peter Kozak Date: Wed, 27 Feb 2013 16:57:44 -0500 Subject: use call model for tel: url binding --- app/controllers/sip_accounts_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/sip_accounts_controller.rb') diff --git a/app/controllers/sip_accounts_controller.rb b/app/controllers/sip_accounts_controller.rb index 621bd3c..27d464f 100644 --- a/app/controllers/sip_accounts_controller.rb +++ b/app/controllers/sip_accounts_controller.rb @@ -11,7 +11,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 -- cgit v1.2.3 From 144a26c3e33dd0072d269b7d8df18268de3c1a04 Mon Sep 17 00:00:00 2001 From: Peter Kozak Date: Wed, 27 Feb 2013 17:02:27 -0500 Subject: custom action call removed --- app/controllers/sip_accounts_controller.rb | 31 ------------------------------ 1 file changed, 31 deletions(-) (limited to 'app/controllers/sip_accounts_controller.rb') diff --git a/app/controllers/sip_accounts_controller.rb b/app/controllers/sip_accounts_controller.rb index 27d464f..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 @@ -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 => "", - ) - return; - end - render( - :status => 404, - :layout => false, - :content_type => 'text/plain', - :text => "", - ) - return; - end - - render( - :status => 404, - :layout => false, - :content_type => 'text/plain', - :text => "", - ) - end - private def set_and_authorize_parent @parent = @user || @tenant -- cgit v1.2.3