rbrindley: branch 2.0 r4748 - /branches/2.0/config/js/pbx2.js

[SVN commits to the Asterisk-GUI project]

Author: rbrindley
Date: Tue Apr 21 08:05:54 2009
New Revision: 4748

URL: http://svn.digium.com/svn-view/asterisk-gui?view=rev&rev=4748
Log:

- fixed an issue where incoming calling rules were being improperly written

(closes issue #14911)
Reported by: magicrhesus


Modified:
    branches/2.0/config/js/pbx2.js

Modified: branches/2.0/config/js/pbx2.js
URL: http://svn.digium.com/svn-view/asterisk-gui/branches/2.0/config/js/pbx2.js?view=diff&rev=4748&r1=4747&r2=4748
==============================================================================
--- branches/2.0/config/js/pbx2.js (original)
+++ branches/2.0/config/js/pbx2.js Tue Apr 21 08:05:54 2009
@@ -1654,8 +1654,8 @@
 	/* kk, now lets form the rule */
 	var trunk_type = parent.pbx.trunks.getType(params.trunk);
 	var prior = (trunk_type === 'analog' && params.pattern === 's') ? '3' : '1';
-	var rule = params.pattern + delim + prior + delim;
-	rule += (params.dest === 'ByDID') ? 'Goto(default,${EXTEN:'+params.digits+'}'+delim+'1)' : params.dest;
+	var rule = params.pattern + ',' + prior + ',';
+	rule += (params.dest === 'ByDID') ? 'Goto(default'+ delim + '${EXTEN:'+params.digits+'}'+delim+'1)' : params.dest;
 
 	/* TODO: cache this on load, this isn't optimal even to call it on page load */
 	var extens_conf = config2json({filename: 'extensions.conf', usf:0});
@@ -1724,19 +1724,19 @@
 pbx.trunks.rules.edit = function(params) {
 	/* check to make sure we got everything */
 	if (typeof params !== 'object') {
-		top.log.error('pbx.trunks.rules.add: Expecting params to be an object.');
+		top.log.error('pbx.trunks.rules.edit: Expecting params to be an object.');
 		return false;
 	} else if (!params.line) {
-		top.log.error('pbx.trunks.rules.add: params.line not found.');
+		top.log.error('pbx.trunks.rules.edit: params.line not found.');
 		return false;
 	} else if (!params.cxt) {
-		top.log.error('pbx.trunks.rules.add: params.cxt not found.');
+		top.log.error('pbx.trunks.rules.edit: params.cxt not found.');
 		return false;
 	} else if (!params.dest) {
-		top.log.error('pbx.trunks.rules.add: params.dest not found.');
+		top.log.error('pbx.trunks.rules.edit: params.dest not found.');
 		return false;
 	} else if (!params.pattern) {
-		top.log.error('pbx.trunks.rules.add: params.pattern not found.');
+		top.log.error('pbx.trunks.rules.edit: params.pattern not found.');
 		return false;
 	} else if (params.dest === 'ByDID' && !params.digits) {
 		top.log.error('pbx.trunks.rules.add: Destination is ByDID, but params.digits is not found.');
@@ -1748,8 +1748,8 @@
 
 	/* kk, now lets form the rule */
 	var prior = ASTGUI.parseContextLine.getPriority(params.line);
-	var rule = params.pattern + delim + prior + delim;
-	rule += (params.dest === 'ByDID') ? 'Goto(default,${EXTEN:'+params.digits+'}'+delim+'1)' : params.dest;
+	var rule = params.pattern + ',' + prior + ',';
+	rule += (params.dest === 'ByDID') ? 'Goto(default'+delim+'${EXTEN:'+params.digits+'}'+delim+'1)' : params.dest;
 
 	var actions = new listOfSynActions('extensions.conf');
 	actions.new_action('update', params.cxt, 'exten', rule, params.line.afterChar('='));