pari: trunk r1707 - in /trunk/config: incoming.html numberplan.html

[SVN commits to the Asterisk-GUI project]

Author: pari
Date: Fri Oct 19 15:31:34 2007
New Revision: 1707

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1707
Log:
donot show fxo signalled spans in incoming and outgoing calling rules

Modified:
    trunk/config/incoming.html
    trunk/config/numberplan.html

Modified: trunk/config/incoming.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/incoming.html?view=diff&rev=1707&r1=1706&r2=1707
==============================================================================
--- trunk/config/incoming.html (original)
+++ trunk/config/incoming.html Fri Oct 19 15:31:34 2007
@@ -35,7 +35,8 @@
 }
 
 user_callbacks.format = function(t, x) {
-	var tmp = asterisk_guiTDPrefix + t.name ; 
+	var tmp = asterisk_guiTDPrefix + t.name ;
+	if (t.fieldbyname['fxochannels']){ return false; }
 	if ( ( t.fieldbyname['context'] == tmp ) && x == undefined ) {
 		didtrunks[tmp] = new Object();
 		didtrunks[tmp].trunkname = t.fieldbyname['trunkname'] ; 
@@ -56,6 +57,8 @@
 // parse all contexts in extensions.conf that look like [DID_trunk_x]
 // and show each entry in the table
 numplan_callbacks.format = function(t, x) {
+	if((typeof didtrunks[t.name] == "undefined") && t.name.contains('_span_')){ return false; }
+
 	if ((t.name == specialcontext && x != undefined )){
 		var p = format_extension( _$('extensions'), t, x)  ;
 		if ( p != null ){

Modified: trunk/config/numberplan.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/numberplan.html?view=diff&rev=1707&r1=1706&r2=1707
==============================================================================
--- trunk/config/numberplan.html (original)
+++ trunk/config/numberplan.html Fri Oct 19 15:31:34 2007
@@ -551,6 +551,9 @@
 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 ;