From d4a664a0495bd183b16a239aeb4c342e1ca739fa Mon Sep 17 00:00:00 2001 From: spag Date: Wed, 30 Jan 2013 15:59:52 +0100 Subject: select route endpoint --- app/controllers/call_routes_controller.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'app/controllers/call_routes_controller.rb') diff --git a/app/controllers/call_routes_controller.rb b/app/controllers/call_routes_controller.rb index 0259a10..653fd55 100644 --- a/app/controllers/call_routes_controller.rb +++ b/app/controllers/call_routes_controller.rb @@ -1,6 +1,12 @@ class CallRoutesController < ApplicationController authorize_resource :call_route + before_filter { |controller| + if !params[:call_route].blank? and !params[:call_route][:endpoint_str].blank? + params[:call_route][:endpoint_type], delimeter, params[:call_route][:endpoint_id] = params[:call_route][:endpoint_str].partition('=') + end + } + def index @call_routes = CallRoute.order([:routing_table, :position]) @routing_tables = @call_routes.pluck(:routing_table).uniq.sort @@ -29,6 +35,11 @@ class CallRoutesController < ApplicationController def edit @call_route = CallRoute.find(params[:id]) + @endpoints = Gateway.all.collect {|r| [ "gateway: #{r.to_s}", "gateway=#{r.id}" ] } + @endpoints << [ 'phonenumber', 'phonenumber' ] + @endpoints << [ 'dialplanfunction', 'dialplanfunction' ] + @endpoints << [ 'hangup', 'hangup' ] + @endpoints << [ 'unknown', 'unknown' ] spread_breadcrumbs end -- cgit v1.2.3 From 83120928fc2dabe225215668943452065d8bc52f Mon Sep 17 00:00:00 2001 From: spag Date: Wed, 30 Jan 2013 16:05:20 +0100 Subject: equality sign --- app/controllers/call_routes_controller.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'app/controllers/call_routes_controller.rb') diff --git a/app/controllers/call_routes_controller.rb b/app/controllers/call_routes_controller.rb index 653fd55..7cc50ab 100644 --- a/app/controllers/call_routes_controller.rb +++ b/app/controllers/call_routes_controller.rb @@ -36,10 +36,10 @@ class CallRoutesController < ApplicationController def edit @call_route = CallRoute.find(params[:id]) @endpoints = Gateway.all.collect {|r| [ "gateway: #{r.to_s}", "gateway=#{r.id}" ] } - @endpoints << [ 'phonenumber', 'phonenumber' ] - @endpoints << [ 'dialplanfunction', 'dialplanfunction' ] - @endpoints << [ 'hangup', 'hangup' ] - @endpoints << [ 'unknown', 'unknown' ] + @endpoints << [ 'phonenumber', 'phonenumber=' ] + @endpoints << [ 'dialplanfunction', 'dialplanfunction=' ] + @endpoints << [ 'hangup', 'hangup=' ] + @endpoints << [ 'unknown', 'unknown=' ] spread_breadcrumbs end -- cgit v1.2.3 From 3c0290515e4c097b97ee4fb4d807f9f86c2985a2 Mon Sep 17 00:00:00 2001 From: spag Date: Thu, 31 Jan 2013 20:07:17 +0100 Subject: destinations drop down menu --- app/controllers/call_routes_controller.rb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'app/controllers/call_routes_controller.rb') diff --git a/app/controllers/call_routes_controller.rb b/app/controllers/call_routes_controller.rb index 7cc50ab..894dd61 100644 --- a/app/controllers/call_routes_controller.rb +++ b/app/controllers/call_routes_controller.rb @@ -20,6 +20,11 @@ class CallRoutesController < ApplicationController def new @call_route = CallRoute.new + @endpoints = Gateway.all.collect {|r| [ "gateway: #{r.to_s}", "gateway=#{r.id}" ] } + @endpoints << [ 'phonenumber', 'phonenumber=' ] + @endpoints << [ 'dialplanfunction', 'dialplanfunction=' ] + @endpoints << [ 'hangup', 'hangup=' ] + @endpoints << [ 'unknown', 'unknown=' ] spread_breadcrumbs end -- cgit v1.2.3 From ba5b2737365592cc511a526a3b14be46c3a75467 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 2 Feb 2013 11:42:52 +0100 Subject: Created a sortable table for the call_routes. #151 --- app/controllers/call_routes_controller.rb | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'app/controllers/call_routes_controller.rb') diff --git a/app/controllers/call_routes_controller.rb b/app/controllers/call_routes_controller.rb index 894dd61..779e23c 100644 --- a/app/controllers/call_routes_controller.rb +++ b/app/controllers/call_routes_controller.rb @@ -1,11 +1,11 @@ class CallRoutesController < ApplicationController authorize_resource :call_route - before_filter { |controller| - if !params[:call_route].blank? and !params[:call_route][:endpoint_str].blank? - params[:call_route][:endpoint_type], delimeter, params[:call_route][:endpoint_id] = params[:call_route][:endpoint_str].partition('=') - end - } + # before_filter { |controller| + # if !params[:call_route].blank? and !params[:call_route][:endpoint_str].blank? + # params[:call_route][:endpoint_type], delimeter, params[:call_route][:endpoint_id] = params[:call_route][:endpoint_str].partition('=') + # end + # } def index @call_routes = CallRoute.order([:routing_table, :position]) @@ -64,21 +64,16 @@ class CallRoutesController < ApplicationController redirect_to call_routes_url, :notice => t('call_routes.controller.successfuly_destroyed') end - def move_higher - @call_route = CallRoute.find(params[:id]) - @call_route.move_higher - redirect_to :back - end - - def move_lower - @call_route = CallRoute.find(params[:id]) - @call_route.move_lower - redirect_to :back + def sort + params[:call_route].each_with_index do |id, index| + CallRoute.update_all({position: index+1}, {id: id}) + end + render nothing: true end private def call_route_parameter_params - params.require(:call_route).permit(:routing_table, :name, :endpoint_type, :endpoint_id) + params.require(:call_route).permit(:routing_table, :name, :endpoint_type, :endpoint_id, :position) end def spread_breadcrumbs -- cgit v1.2.3 From 636be20a183fac10637fea700f55f89bc371577b Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 4 Feb 2013 13:51:15 +0100 Subject: Refactoring and bugfixes. --- app/controllers/call_routes_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/controllers/call_routes_controller.rb') diff --git a/app/controllers/call_routes_controller.rb b/app/controllers/call_routes_controller.rb index 779e23c..661ceba 100644 --- a/app/controllers/call_routes_controller.rb +++ b/app/controllers/call_routes_controller.rb @@ -1,5 +1,5 @@ class CallRoutesController < ApplicationController - authorize_resource :call_route + authorize_resource :call_route, :except => [:sort] # before_filter { |controller| # if !params[:call_route].blank? and !params[:call_route][:endpoint_str].blank? @@ -67,6 +67,7 @@ class CallRoutesController < ApplicationController def sort params[:call_route].each_with_index do |id, index| CallRoute.update_all({position: index+1}, {id: id}) + #CallRoute.find(:id).move_to_bottom end render nothing: true end -- cgit v1.2.3 From 5a58c0c41de983a72cdacd06c5be80f120d1e080 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 4 Feb 2013 13:58:20 +0100 Subject: Bugfix #157 --- app/controllers/call_routes_controller.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'app/controllers/call_routes_controller.rb') diff --git a/app/controllers/call_routes_controller.rb b/app/controllers/call_routes_controller.rb index 661ceba..3977132 100644 --- a/app/controllers/call_routes_controller.rb +++ b/app/controllers/call_routes_controller.rb @@ -1,11 +1,11 @@ class CallRoutesController < ApplicationController authorize_resource :call_route, :except => [:sort] - # before_filter { |controller| - # if !params[:call_route].blank? and !params[:call_route][:endpoint_str].blank? - # params[:call_route][:endpoint_type], delimeter, params[:call_route][:endpoint_id] = params[:call_route][:endpoint_str].partition('=') - # end - # } + before_filter { |controller| + if !params[:call_route].blank? && !params[:call_route][:endpoint_str].blank? + params[:call_route][:endpoint_type], delimeter, params[:call_route][:endpoint_id] = params[:call_route][:endpoint_str].partition('=') + end + } def index @call_routes = CallRoute.order([:routing_table, :position]) -- cgit v1.2.3 From bcce809c6e628fb7c067437e98a5195c5e228532 Mon Sep 17 00:00:00 2001 From: spag Date: Tue, 5 Feb 2013 13:58:58 +0100 Subject: show dialplan variables --- app/controllers/call_routes_controller.rb | 66 +++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) (limited to 'app/controllers/call_routes_controller.rb') diff --git a/app/controllers/call_routes_controller.rb b/app/controllers/call_routes_controller.rb index 3977132..60104eb 100644 --- a/app/controllers/call_routes_controller.rb +++ b/app/controllers/call_routes_controller.rb @@ -51,7 +51,13 @@ class CallRoutesController < ApplicationController def update @call_route = CallRoute.find(params[:id]) spread_breadcrumbs + + logger.error "ENDPOINT TYPE: #{params[:call_route][:endpoint_type]}" + logger.error "ENDPOINT ID: #{params[:call_route][:endpoint_id]}" + logger.error "ENDPOINT STR: #{params[:call_route][:endpoint_str]}" + if @call_route.update_attributes(call_route_parameter_params) + logger.error "CALL_ROUTE: #{@call_route.inspect}" redirect_to @call_route, :notice => t('call_routes.controller.successfuly_updated') else render :edit @@ -72,6 +78,20 @@ class CallRoutesController < ApplicationController render nothing: true end + def show_variables + @channel_variables = Hash.new() + file_name = '/var/log/freeswitch/variables' + if File.readable?(file_name) + File.readlines(file_name).each do |line| + key, delimeter, value = line.partition(': ') + key = to_channel_variable_name(key) + if !key.blank? + @channel_variables[key] = URI.unescape(value.gsub(/\n/, '')); + end + end + end + end + private def call_route_parameter_params params.require(:call_route).permit(:routing_table, :name, :endpoint_type, :endpoint_id, :position) @@ -84,4 +104,50 @@ class CallRoutesController < ApplicationController end end + def to_channel_variable_name(name) + variables_map = { + 'Channel-State' => 'state', + 'Channel-State-Number' => 'state_number', + 'Channel-Name' => 'channel_name', + 'Unique-ID' => 'uuid', + 'Call-Direction' => 'direction', + 'Answer-State' => 'state', + 'Channel-Read-Codec-Name' => 'read_codec', + 'Channel-Read-Codec-Rate' => 'read_rate', + 'Channel-Write-Codec-Name' => 'write_codec', + 'Channel-Write-Codec-Rate' => 'write_rate', + 'Caller-Username' => 'username', + 'Caller-Dialplan' => 'dialplan', + 'Caller-Caller-ID-Name' => 'caller_id_name', + 'Caller-Caller-ID-Number' => 'caller_id_number', + 'Caller-ANI' => 'ani', + 'Caller-ANI-II' => 'aniii', + 'Caller-Network-Addr' => 'network_addr', + 'Caller-Destination-Number' => 'destination_number', + 'Caller-Unique-ID' => 'uuid', + 'Caller-Source' => 'source', + 'Caller-Context' => 'context', + 'Caller-RDNIS' => 'rdnis', + 'Caller-Channel-Name' => 'channel_name', + 'Caller-Profile-Index' => 'profile_index', + 'Caller-Channel-Created-Time' => 'created_time', + 'Caller-Channel-Answered-Time' => 'answered_time', + 'Caller-Channel-Hangup-Time' => 'hangup_time', + 'Caller-Channel-Transfer-Time' => 'transfer_time', + 'Caller-Screen-Bit' => 'screen_bit', + 'Caller-Privacy-Hide-Name' => 'privacy_hide_name', + 'Caller-Privacy-Hide-Number' => 'privacy_hide_number', + } + + name = name.gsub(/[^a-zA-Z1-9_\-]/, '') + + if variables_map[name] + return variables_map[name] + elsif name.match(/^variable_/) + return name.gsub(/^variable_/, '') + end + + return nil + end + end -- cgit v1.2.3 From c7379b1b30043b5526aa3a5dc7f0111174a7f915 Mon Sep 17 00:00:00 2001 From: spag Date: Tue, 5 Feb 2013 14:05:40 +0100 Subject: loging removed --- app/controllers/call_routes_controller.rb | 5 ----- 1 file changed, 5 deletions(-) (limited to 'app/controllers/call_routes_controller.rb') diff --git a/app/controllers/call_routes_controller.rb b/app/controllers/call_routes_controller.rb index 60104eb..2dcd648 100644 --- a/app/controllers/call_routes_controller.rb +++ b/app/controllers/call_routes_controller.rb @@ -52,12 +52,7 @@ class CallRoutesController < ApplicationController @call_route = CallRoute.find(params[:id]) spread_breadcrumbs - logger.error "ENDPOINT TYPE: #{params[:call_route][:endpoint_type]}" - logger.error "ENDPOINT ID: #{params[:call_route][:endpoint_id]}" - logger.error "ENDPOINT STR: #{params[:call_route][:endpoint_str]}" - if @call_route.update_attributes(call_route_parameter_params) - logger.error "CALL_ROUTE: #{@call_route.inspect}" redirect_to @call_route, :notice => t('call_routes.controller.successfuly_updated') else render :edit -- cgit v1.2.3