Author: pari
Date: Mon Dec 10 11:10:25 2007
New Revision: 1949
URL: http://svn.digium.com/view/asterisk-gui?view=rev&am
p;rev=1949
Log:
*** new Ztscan will be reporting FXO ports (FXS signalled)
as FXO ports and vice versa ***
Modified:
branches/asterisknow/config/cfgbasic.html
branches/asterisknow/config/digital.html
branches/asterisknow/config/numberplan.html
branches/asterisknow/config/ringgroups.html
branches/asterisknow/config/trunks.html
branches/asterisknow/config/users.html
Modified: branches/asterisknow/config/cfgbasic.html
URL: http://svn.digium.com/view/asterisk-gui/bran
ches/asterisknow/config/cfgbasic.html?view=diff&rev=1949
&r1=1948&r2=1949
============================================================
==================
--- branches/asterisknow/config/cfgbasic.html (original)
+++ branches/asterisknow/config/cfgbasic.html Mon Dec 10
11:10:25 2007
 -28,7
+28,7
<script>
var FXO_PORTS_DETECTED = []; // so that we donot have to
parse ztscan output each time where we want this list
var FXS_PORTS_DETECTED = []; // so that we donot have to
parse ztscan output each time where we want this list
-// note that the above FXO_PORTS_DETECTED,
FXS_PORTS_DETECTED are the actual analog FXS, FXO ports
+// note that the above FXO_PORTS_DETECTED,
FXS_PORTS_DETECTED are the actual 'analog FXS, FXO' ports
// and NOT the channels on a digital span with FXS or FXO
signalling
var eventeater = new Object;
Modified: branches/asterisknow/config/digital.html
URL: http://svn.digium.com/view/asterisk-gui/branc
hes/asterisknow/config/digital.html?view=diff&rev=1949&a
mp;r1=1948&r2=1949
============================================================
==================
--- branches/asterisknow/config/digital.html (original)
+++ branches/asterisknow/config/digital.html Mon Dec 10
11:10:25 2007
-630,7
+630,9
uri += build_action('update', c, d ,
"hassip", 'no'); c++;
uri += build_action('update', c, d ,
"hasiax", 'no'); c++;
uri += build_action('update', c, d , "group",
NEWGROUPNUMBER ); c++;
- if ( !SPANS[k]['signalling'].beginsWith('fxo') ){ // we
donot want context to be set for user stations
+ if ( !SPANS[k]['signalling'].beginsWith('fxs') ){
+ // we do not want a context to be set for user
stations
+ // instead, this context would be set when the station
is assigned to a user
uri += build_action('update', c, d ,
"context", e); c++;
}
uri += build_action('update', c, d ,
"zapchan", SPANS[k]['zapchanstring'] ); c++;
-718,10
+720,12
// write back any actual analog ports
if( parent.FXO_PORTS_DETECTED.length){
- uri += build_action('append', c, context, 'fxoks',
parent.FXO_PORTS_DETECTED.join(',')); c++;
+ uri += build_action('append', c, context, 'fxsks',
parent.FXO_PORTS_DETECTED.join(',')); c++;
+ // FXO ports will be fxs signalled
}
if( parent.FXS_PORTS_DETECTED.length){
- uri += build_action('append', c, context, 'fxsks',
parent.FXS_PORTS_DETECTED.join(',')); c++;
+ uri += build_action('append', c, context, 'fxoks',
parent.FXS_PORTS_DETECTED.join(',')); c++;
+ // FXS ports will be fxo signalled
}
uri += build_action('append', c, context, 'loadzone',
_$('loadZone').value); c++;
uri += build_action('append', c, context, 'defaultzone',
'us'); c++;
Modified: branches/asterisknow/config/numberplan.html
URL: http://svn.digium.com/view/asterisk-gui/br
anches/asterisknow/config/numberplan.html?view=diff&rev=
1949&r1=1948&r2=1949
============================================================
==================
--- branches/asterisknow/config/numberplan.html (original)
+++ branches/asterisknow/config/numberplan.html Mon Dec 10
11:10:25 2007
-551,9
+551,6
function trunks_loaded(b){
var c = b ;
for( var d in c ){
- if ( c.hasOwnProperty(d) && c[d]['context']
&& (c[d]['context'] == asterisk_guiTDPrefix + d )
&& c[d]['fxochannels'] ) {
- continue;
- }
if ( c.hasOwnProperty(d) && c[d]['context']
&& (c[d]['context'] == asterisk_guiTDPrefix + d ) )
{
trunks_desc[d] = new Object();
trunks_desc[d].comment = (c[d]['trunkname']) ?
unescape(c[d]['trunkname']) : d ;
Modified: branches/asterisknow/config/ringgroups.html
URL: http://svn.digium.com/view/asterisk-gui/br
anches/asterisknow/config/ringgroups.html?view=diff&rev=
1949&r1=1948&r2=1949
============================================================
==================
--- branches/asterisknow/config/ringgroups.html (original)
+++ branches/asterisknow/config/ringgroups.html Mon Dec 10
11:10:25 2007
-322,7
+322,7
// so we need to load users.conf and extensions.conf
//
- parent.FXO_PORTS_DETECTED.each( function(y) {
+ parent.FXS_PORTS_DETECTED.each( function(y) {
LISTOFCHANNELS['Zap/' + y] = {};
LISTOFCHANNELS['Zap/' + y]['ChannelName'] = 'Analog Phone
' + y;
});
Modified: branches/asterisknow/config/trunks.html
URL: http://svn.digium.com/view/asterisk-gui/branch
es/asterisknow/config/trunks.html?view=diff&rev=1949&
;r1=1948&r2=1949
============================================================
==================
--- branches/asterisknow/config/trunks.html (original)
+++ branches/asterisknow/config/trunks.html Mon Dec 10
11:10:25 2007
-670,7
+670,7
provwidgets[provfieldnames[x]].disabled = true;
}
- parent.FXS_PORTS_DETECTED.each( function(y) {
+ parent.FXO_PORTS_DETECTED.each( function(y) {
ASTGUI.selectbox.append( _$('zapchan'),"Analog Port
#" + y , y );
});
parent.astmanEngine.config2list("providers.conf"
, _$('provider'), provwidgets, providercallbacks);
Modified: branches/asterisknow/config/users.html
URL: http://svn.digium.com/view/asterisk-gui/branche
s/asterisknow/config/users.html?view=diff&rev=1949&r
1=1948&r2=1949
============================================================
==================
--- branches/asterisknow/config/users.html (original)
+++ branches/asterisknow/config/users.html Mon Dec 10
11:10:25 2007
-108,7
+108,7
return null;
}
- if ( t.name.beginsWith('span_') &&
t.fieldbyname['signalling'].beginsWith('fxo') &&
t.fieldbyname['zapchan'] ) {
+ if ( t.name.beginsWith('span_') &&
t.fieldbyname['signalling'].beginsWith('fxs') &&
t.fieldbyname['zapchan'] ) {
add_DigitalChannels(t.fieldbyname['zapchan']);
return null;
}
-332,7
+332,7
}
}
var _zapchan = _$('zapchan') ;
- parent.FXO_PORTS_DETECTED.each( function(y) {
+ parent.FXS_PORTS_DETECTED.each( function(y) {
ASTGUI.selectbox.append( _zapchan,"Analog Port
#" + y , y );
});
_______________________________________________
--Bandwidth and Colocation Provided by http://www.api-digital.c
om--
asterisk-gui-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/asterisk-g
ui-commits
|