pari: branch asterisknow r2201 - /branches/asterisknow/config/

[SVN commits to the Asterisk-GUI project]

Author: pari
Date: Fri Jan 25 18:29:48 2008
New Revision: 2201

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=2201
Log:
Fix for BE-329: 'New analog' message shows up twice on initial boot.
Description: When you login to the gui, the gui informs you that you have new hardware. 
             This message appears twice, one after the other.
Reported by : Sean Pimental



Modified:
    branches/asterisknow/config/cfgbasic.html
    branches/asterisknow/config/home.html

Modified: branches/asterisknow/config/cfgbasic.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/cfgbasic.html?view=diff&rev=2201&r1=2200&r2=2201
==============================================================================
--- branches/asterisknow/config/cfgbasic.html (original)
+++ branches/asterisknow/config/cfgbasic.html Fri Jan 25 18:29:48 2008
@@ -55,7 +55,7 @@
 	r.PanelDesc = s[2];
 	MainScreenPanels.push(r);
 };
-
+var ABOUT_TORELOAD_GUI = false ; // If the gui is being reloaded from some where else, this flag is used in some setTimeout functions to know whether to proceed or abort actions.
 
 function get_FXOFXSPORTS(c){
 	var y;
@@ -94,13 +94,14 @@
 		}
 
 		if( CONFIGURED_FXOPORTS != FXO_PORTS_DETECTED.join(',') || CONFIGURED_FXSPORTS != FXS_PORTS_DETECTED.join(',') ){
+			if( !ABOUT_TORELOAD_GUI ){
 			alert('Changes detected in your Analog Hardware !! \n\n' +
 				'You have to reconfigure any previously assigned \n'
 				+ ' FXS stations or Analog Service Providers. \n\n'
 				+ "Note: Your Analog Hardware will not work properly until\n " 
 				+ " you click 'Apply Changes' button in the 'Setup Hardware' panel" );
+			}
 		}
-
 	};
 	config2json(hwcfgfile, 1, hwcfgfile_parse);
 }

Modified: branches/asterisknow/config/home.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/home.html?view=diff&rev=2201&r1=2200&r2=2201
==============================================================================
--- branches/asterisknow/config/home.html (original)
+++ branches/asterisknow/config/home.html Fri Jan 25 18:29:48 2008
@@ -198,6 +198,7 @@
 function installguitools(){
 	var after = function(){ // then reload asterisk
 		parent.astmanEngine.cliCommand('reload', function(t){ gui_feedback("Restarted Asterisk !!",'blue'); 
+			parent.ABOUT_TORELOAD_GUI = true;
 			top.window.location.reload(); // at this point ztscan call was failed as it needs this context to run, so reload
 		}); 
 	};