pari: branch aadk r775 - in /branches/aadk: ./ config/trunks.html

[asterisk-gui-commits at lists.digium.com]

Author: pari
Date: Thu Apr 26 15:08:42 2007
New Revision: 775

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=775
Log:
Merged revisions 772-773 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-gui/trunk

........
r772 | pari | 2007-04-26 13:59:05 -0500 (Thu, 26 Apr 2007) | 1 line

Bug Fix: When Editing an Analog trunk - the first analog port is checked irrespective of waht trunks are selected
........
r773 | pari | 2007-04-26 15:05:09 -0500 (Thu, 26 Apr 2007) | 1 line

Fix: Editing analog trunks not working properly
........

Modified:
    branches/aadk/   (props changed)
    branches/aadk/config/trunks.html

Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Apr 26 15:08:42 2007
@@ -1,1 +1,1 @@
-/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-758
+/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-767,769-774

Modified: branches/aadk/config/trunks.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/trunks.html?view=diff&rev=775&r1=774&r2=775
==============================================================================
--- branches/aadk/config/trunks.html (original)
+++ branches/aadk/config/trunks.html Thu Apr 26 15:08:42 2007
@@ -133,6 +133,9 @@
 }
 
 callbacks.cancelnewcategory = function(){
+	remove_event( _$('trunkstyleanalog') , 'click' , activateanalogvoip );
+	remove_event( _$('trunkstylevoip') , 'click' , activateanalogvoip );
+	remove_event( _$('trunkstylecustomvoip') , 'click' , activateanalogvoip );
 	hideSPdetails();
 }
 
@@ -231,6 +234,23 @@
 		}
 		dids_array.push( _name.value );
 	}else{
+
+		if( _$('trunkstyleanalog').checked ){
+			_$('context').value =  asterisk_guiTDPrefix + _$('name').value  ;
+			var needcomma = 0 ;
+			var count = 0 ;
+			_$('trunkname').value = "" ;
+			for (var x=0;x< _$('zapchan').options.length;x++) {
+				if (_$('zapchan').options[x].selected) {
+					if(needcomma){ _$('trunkname').value += "," }
+					needcomma = 1 ;
+					_$('trunkname').value += _$('zapchan').options[x].value ;
+					count++ ;
+				}
+			}
+			_$('trunkname').value = ((count > 1) ? "Ports ":"Port ") + _$('trunkname').value ;
+		}
+
 		old_trunkname = _dvcs_v ;
 		if( _dvcs_v != _name.value ){ // if the trunk name is changed , change the name in dids_array
 			for( var i=0 ; i < dids_array.length; i ++){  if( dids_array[i] == _dvcs_v ) { dids_array[i] = _name.value ; break; } }
@@ -254,7 +274,12 @@
 	}else{
 		if(old_trunkname != _$('name').value ){ update_didcontext(old_trunkname, _$('name').value); } // rename DID if needed
 	}
-	return false;
+
+
+	hideSPdetails();
+	loadServiceProvidersintotable();
+
+	return true;
 }
 
 
@@ -402,6 +427,11 @@
 	_$('customvoip').style.display="none";
 	_$('userscontent_title').innerHTML = "Add Service Provider";
 	isnewtrunk = 1;
+
+	add_event( _$('trunkstyleanalog') , 'click' , activateanalogvoip );
+	add_event( _$('trunkstylevoip') , 'click' , activateanalogvoip );
+	add_event( _$('trunkstylecustomvoip') , 'click' , activateanalogvoip );
+
 	return tmp;
 }
 
@@ -687,6 +717,7 @@
 		if(sp_value == _devices.options[i].value ){
 			_devices.selectitem(i);
 			showSPdetails();
+			activateanalogvoip();
 			break;
 		}
 	}
@@ -946,9 +977,9 @@
 	<div id='cabinet' style='width:0;overflow:hidden'><select id='hiddenglobals'></select></div>
 	<fieldset>
 		<legend><B>&nbsp;Provider Type:&nbsp;</B></legend>
-		<LABEL FOR="trunkstyleanalog"><input name='trunkstyle' type='radio' id='trunkstyleanalog' onclick='activateanalogvoip()' value='analog'>Analog</LABEL><BR>
-		<LABEL FOR="trunkstylevoip"><input name='trunkstyle' type='radio' id='trunkstylevoip' onclick='activateanalogvoip()' value='voip'>VoIP</LABEL><BR>
-		<LABEL FOR="trunkstylecustomvoip"><input name='trunkstyle' type='radio' id='trunkstylecustomvoip' onclick='activateanalogvoip()' value='customvoip'>Custom VoIP</LABEL>
+		<LABEL FOR="trunkstyleanalog"><input name='trunkstyle' type='radio' id='trunkstyleanalog' value='analog'>Analog</LABEL><BR>
+		<LABEL FOR="trunkstylevoip"><input name='trunkstyle' type='radio' id='trunkstylevoip' value='voip'>VoIP</LABEL><BR>
+		<LABEL FOR="trunkstylecustomvoip"><input name='trunkstyle' type='radio' id='trunkstylecustomvoip' value='customvoip'>Custom VoIP</LABEL>
 	</fieldset>
 	<div id="div_providername" style="display:none">
 		<BR><BR><B>Provider Name:</B><BR><input id="name" size=10 class='input8'>