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

[SVN commits to the Asterisk-GUI project]

Author: rbrindley
Date: Wed Apr  8 11:12:13 2009
New Revision: 4722

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

- renamed zap_channels to just channels (more generic)
- lets move the definition of trunk.channel and trunk.signalling below the main new_action loop as well


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=4722&r1=4721&r2=4722
==============================================================================
--- branches/2.0/config/js/pbx2.js (original)
+++ branches/2.0/config/js/pbx2.js Wed Apr  8 11:12:13 2009
@@ -1173,9 +1173,9 @@
 		name = this.nextAvailTrunk();
 		group = this.nextAvailGroup();
 
-		trunk.signalling = '';
-		trunk.channel = '';
-		var zap_channels = ASTGUI.miscFunctions.chanStringToArray(chans);
+		delete trunk.signalling;
+		delete trunk.channel;
+		var channels = ASTGUI.miscFunctions.chanStringToArray(chans);
 
 		trunk[parent.sessionData.DahdiChannelString] = chans;
 
@@ -1239,9 +1239,11 @@
 	users_conf.new_action('append', name, 'allow', trunk['allow']);
 
 	if (type === 'analog') {
-		zap_channels.each(function(ch) {
+		channels.each(function(ch) {
 			var ls = ASTGUI.cloneObject(sessionData.PORTS_SIGNALLING.ls);
 			var sg = (ls.contains(ch)) ? 'fxs_ls' : 'fxs_ks';
+			trunk.signalling = sg;
+			trunk.channel = ch;
 			users_conf.new_action('append', name, 'signalling', sg);
 			users_conf.new_action('append', name, 'channel', ch);
 		});