pari: branch asterisknow r1894 - /branches/asterisknow/config/digital.html

[SVN commits to the Asterisk-GUI project]

Author: pari
Date: Tue Dec  4 14:56:37 2007
New Revision: 1894

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1894
Log:
define DID contexts only for non FXP singalled SPANS 

Modified:
    branches/asterisknow/config/digital.html

Modified: branches/asterisknow/config/digital.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/digital.html?view=diff&rev=1894&r1=1893&r2=1894
==============================================================================
--- branches/asterisknow/config/digital.html (original)
+++ branches/asterisknow/config/digital.html Tue Dec  4 14:56:37 2007
@@ -405,10 +405,7 @@
 						SPANS[tmp]['definedchans'] = 0;
 						for( var k in n[l] ){ if(n[l].hasOwnProperty(k)){
 							if( k == 'signalling' || k == 'zapchan' || k == 'switchtype' ){ SPANS[tmp][k] = n[l][k]; }
-							//if( k=='zapchan' || k=='fxochannels'){ SPANS[tmp]['definedchans'] = efgh(n[l][k]); }
-							if( k=='zapchan' ){ SPANS[tmp]['definedchans'] = efgh(n[l][k]); }
-							// i totally forgot why i added that 'fxochannels' thing is and what i was using it for,
-							// this is exactly why i should comment my code more often, well atleast from now on.
+							if( k=='zapchan'){ SPANS[tmp]['definedchans'] = efgh(n[l][k]); }
 						}}
 					}
 				}}
@@ -510,19 +507,15 @@
 				uri += build_action('update', c, d , "signalling", SPANS[k]['signalling']); c++;
 				uri += build_action('update', c, d , "trunkname", 'Span '+String(k)); c++;
 				uri += build_action('update', c, d , "trunkstyle", 'digital'); c++;
-				uri += build_action('update', c, d , "context", e); c++;
 				uri += build_action('update', c, d , "hassip", 'no'); c++;
 				uri += build_action('update', c, d , "hasiax", 'no'); c++;
 
-				if ( !SPANS[k]['signalling'].beginsWith('fxo') ){
+				if ( !SPANS[k]['signalling'].beginsWith('fxo') ){ // we donot want context to be set for user stations
 					uri += build_action('update', c, d , "group", String(k)); c++;
-					uri += build_action('update', c, d , "zapchan", SPANS[k]['zapchanstring'] ); c++;
-				}else{ 
-					// if fxs signalling , donot add zapchan under span_x,
-					// we would want to define zapchan under the user extension to which we want the station to be assigned to
-					uri += build_action('update', c, d , "fxochannels", SPANS[k]['zapchanstring'] ); c++;
+					uri += build_action('update', c, d , "context", e); c++;
 				}
 
+				uri += build_action('update', c, d , "zapchan", SPANS[k]['zapchanstring'] ); c++;
 				uri2 += build_action('delete', f, 'globals', d, "", ""); f++;
 				uri2 += build_action('update', f, 'globals', d,'Zap/g'+String(k)); f++;
 				uri2 += build_action('delcat', f, e , "", ""); f++;