rbrindley: branch 2.0 r4853 - /branches/2.0/config/js/pbx.js
SVN commits to the Asterisk-GUI project
asterisk-gui-commits at lists.digium.com
Fri Jun 12 06:11:38 CDT 2009
Author: rbrindley
Date: Fri Jun 12 06:11:34 2009
New Revision: 4853
URL: http://svn.asterisk.org/svn-view/asterisk-gui?view=rev&rev=4853
Log:
- for ABE, change all zapchan to dahdichan in users.conf on startup
Modified:
branches/2.0/config/js/pbx.js
Modified: branches/2.0/config/js/pbx.js
URL: http://svn.asterisk.org/svn-view/asterisk-gui/branches/2.0/config/js/pbx.js?view=diff&rev=4853&r1=4852&r2=4853
==============================================================================
--- branches/2.0/config/js/pbx.js (original)
+++ branches/2.0/config/js/pbx.js Fri Jun 12 06:11:34 2009
@@ -461,6 +461,8 @@
var c = config2json({filename:'users.conf', usf:1});
// we should actually be using usf:0 to handle cases like 'allow', 'disallow' defined in multiple lines
// but for the time being we will continue with the assumption that they are all defined in one line
+
+ var users_conf = listofSynActions('users.conf');
sessionData.pbxinfo['users'] = new ASTGUI.customObject ; // reset all users info
if(!sessionData.pbxinfo['trunks']){ sessionData.pbxinfo['trunks'] = new ASTGUI.customObject ; }
@@ -492,6 +494,10 @@
}
// if( c[d]['zapchan'] && (!c[d]['hasiax'] || c[d]['hasiax'] =='no') && (!c[d]['hassip'] || c[d]['hassip'] =='no')){
if( c[d].hasOwnProperty('zapchan') || c[d].hasOwnProperty('dahdichan') ){
+ if (c[d].hasOwnProperty('zapchan') && sessionData.PLATFORM.isABE) {
+ users_conf.new_action('delete', c, 'zapchan', '');
+ users_conf.new_action('append', c, 'dahdichan', c[d].zapchan);
+ }
// if is an analog trunk - note that here we are NOT expecting a 'FXO channel(FXS signalled) on a T1/E1'
// we assume that all the ports in zapchan are actual analog FXO ports
// a trunk for T1/E1 analog channels would begin with 'span_'
@@ -499,6 +505,8 @@
continue;
}
}
+
+ users_conf.callActions();
if( d.beginsWith('span_') && ( c[d].hasOwnProperty('zapchan') || c[d].hasOwnProperty('dahdichan') ) ){
sessionData.pbxinfo['trunks']['pri'][d] = c[d];
More information about the asterisk-gui-commits
mailing list