pari: trunk r181 - in /trunk/config: ./ setup/

asterisk-gui-commits at lists.digium.com asterisk-gui-commits at lists.digium.com
Tue Dec 19 13:50:50 MST 2006


Author: pari
Date: Tue Dec 19 14:50:49 2006
New Revision: 181

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=181
Log:
some minor fixes reported at bugs.digium.com - bugs 8617, 8618, 8620, 8622, 8559 

Modified:
    trunk/config/backup.html
    trunk/config/numberplan.html
    trunk/config/setup/1.html
    trunk/config/setup/3.html
    trunk/config/setup/5.html

Modified: trunk/config/backup.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/backup.html?view=diff&rev=181&r1=180&r2=181
==============================================================================
--- trunk/config/backup.html (original)
+++ trunk/config/backup.html Tue Dec 19 14:50:49 2006
@@ -67,7 +67,9 @@
 		bkpfile =  "conf_" + year + month + day + hour  + minute +seconds  +".tar";
 		parent.astmanEngine.run_tool("/bin/tar -cf "+ bkp_path + bkpfile +" /etc/asterisk/", callback=function(){
 							$('status').innerHTML = " <I> Finished generating Backup ! </I>";
-							$('message_text').innerHTML = "<A href=\"./bkps/"+ bkpfile  +"\" onclick=\"showremovebkpfile()\">Click Here to Download</A>";
+							$('status_message').style.display="none";
+							window.location.href = "./bkps/"+ bkpfile ;
+							//$('message_text').innerHTML = "<A href=\"./bkps/"+ bkpfile  +"\" onclick=\"showremovebkpfile()\">Click Here to Download</A>";
 		} );
 }
 

Modified: trunk/config/numberplan.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/numberplan.html?view=diff&rev=181&r1=180&r2=181
==============================================================================
--- trunk/config/numberplan.html (original)
+++ trunk/config/numberplan.html Tue Dec 19 14:50:49 2006
@@ -36,7 +36,7 @@
 var iscustom ;
 var pattern_beingedited ;
 var pattern_beingedited_priority ;
-
+var oldselect;
 
 function addthe_default_callingplan(){
 	t=confirm("A default Dial Plan is not found. \n" + " Do you want to create a default Dial Plan ");
@@ -80,8 +80,14 @@
 }
 
 trunkcallbacks.loaded = function(){
-	$('trunks').addEventListener('change',enablesave,false);
+	$('trunks').addEventListener('click',hackenablesave,false);
 	parent.astmanEngine.config2list("extensions.conf", $('extensions'), new Array(), numplan_callbacks);
+}
+
+function hackenablesave(){
+	if( oldselect != $('trunks').value ){
+		enablesave();
+	}
 }
 
 numplan_callbacks.format = function(t, x) {
@@ -153,15 +159,13 @@
 						}
 				}				
 				if ( default_np_data[x][sorted_priorities[z]].trunk  == "" ){
-							alert("A Service Provider is not defined for this Rule ("+default_np_data[x][sorted_priorities[z]].rulename+")\n"
-						+" You will now be asked to choose a Service Provider ");
+							alert("Note: A Service Provider is not defined for this Rule ("+default_np_data[x][sorted_priorities[z]].rulename+")\n");
 							$('trunks').selectedIndex = -1;
 						//editcallingrule(x , sorted_priorities[z]);
 						//return true;
 						addrowtotable( x , sorted_priorities[z] , "undefined" , default_np_data[x][sorted_priorities[z]].digits2strip );
 				}else if(trunk_exists == 0){
-							alert("Calling Rule ("+default_np_data[x][sorted_priorities[z]].rulename+") has an invalid Service Provider\n"
-						+" You will now be asked to choose from a list of existing Service Providers ");
+							alert("Note: Calling Rule ("+default_np_data[x][sorted_priorities[z]].rulename+") has an invalid Service Provider\n");
 							$('trunks').selectedIndex = -1;							
 						addrowtotable( x , sorted_priorities[z] , "invalid" , default_np_data[x][sorted_priorities[z]].digits2strip );							
 				}else{
@@ -249,7 +253,7 @@
 function editcallingrule(a,b){
 	pattern_beingedited = a ;
 	pattern_beingedited_priority = b ;
-
+	oldselect = $('trunks').value;
 	isnewrule = false;
 	$('rulename').value = default_np_data[a][b].rulename;
 	$('trunks').selectedIndex = -1 ;

Modified: trunk/config/setup/1.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/setup/1.html?view=diff&rev=181&r1=180&r2=181
==============================================================================
--- trunk/config/setup/1.html (original)
+++ trunk/config/setup/1.html Tue Dec 19 14:50:49 2006
@@ -151,7 +151,7 @@
 	if($('zapchan').length ==0 ){
 		$('detected_info').style.display = "none";
 		$('zapscan_info').innerHTML = " <B>No Analog ports has been detected on your system</B> <BR><BR>"
-		+" If you donot have any analog hardware please click Next to Proceed";
+		+" If you do not have any analog hardware please click Next to proceed";
 	}
 
 	$('loginform').style.display = "none";

Modified: trunk/config/setup/3.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/setup/3.html?view=diff&rev=181&r1=180&r2=181
==============================================================================
--- trunk/config/setup/3.html (original)
+++ trunk/config/setup/3.html Tue Dec 19 14:50:49 2006
@@ -75,6 +75,15 @@
 	window.location.href= go; 
 }
 
+usercallbacks.beforeSaving= function(){
+		if(	$('localextenlength').value != $('userbase').value.length ){
+			alert("'length of Local Extensions' does not match \n the 'length of the Starting point of Allocation'");
+			return false;
+		}
+	return true;
+}
+
+
 usercallbacks.loaded = function(){
 		$('devices').selectitem(0);
 		parent.$('next').disabled = false;	

Modified: trunk/config/setup/5.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/setup/5.html?view=diff&rev=181&r1=180&r2=181
==============================================================================
--- trunk/config/setup/5.html (original)
+++ trunk/config/setup/5.html Tue Dec 19 14:50:49 2006
@@ -19,6 +19,7 @@
 var iscustom ;
 var pattern_beingedited ;
 var pattern_beingedited_priority ;
+var oldselect;
 
 function localinit(){
 	//parent.$('next').disabled = true;
@@ -97,8 +98,14 @@
 }
 
 trunkcallbacks.loaded = function(){
-	$('trunks').addEventListener('change',enablesave,false);
+	$('trunks').addEventListener('click',hackenablesave,false);
 	parent.astmanEngine.config2list("extensions.conf", $('extensions'), new Array(), numplan_callbacks);
+}
+
+function hackenablesave(){
+	if( oldselect != $('trunks').value ){
+		enablesave();
+	}
 }
 
 numplan_callbacks.format = function(t, x) {
@@ -260,7 +267,7 @@
 function editcallingrule(a,b){
 	pattern_beingedited = a ;
 	pattern_beingedited_priority = b ;
-
+	oldselect = $('trunks').value;
 	isnewrule = false;
 	$('rulename').value = default_np_data[a][b].rulename;
 	$('trunks').selectedIndex = -1 ;



More information about the asterisk-gui-commits mailing list