rbrindley: branch 2.0 r4490 - /branches/2.0/config/js/pbx.js

[SVN commits to the Asterisk-GUI project]

Author: rbrindley
Date: Wed Jan 28 15:17:20 2009
New Revision: 4490

URL: http://svn.digium.com/svn-view/asterisk-gui?view=rev&rev=4490
Log:

CRITICAL BUG FIX
- moved the call to script_detectdahdi in pbx.js above the call to generate the dahdi config file
	- this was causing the gui to not load properly when dahdi was not installed

(closes issue 0014171)
(closes issue 0014324)


Modified:
    branches/2.0/config/js/pbx.js

Modified: branches/2.0/config/js/pbx.js
URL: http://svn.digium.com/svn-view/asterisk-gui/branches/2.0/config/js/pbx.js?view=diff&rev=4490&r1=4489&r2=4490
==============================================================================
--- branches/2.0/config/js/pbx.js (original)
+++ branches/2.0/config/js/pbx.js Wed Jan 28 15:17:20 2009
@@ -188,6 +188,16 @@
 			};
 
 			var s = $.ajax({ url: ASTGUI.paths.rawman+'?action=getconfig&filename=' + ASTGUI.globals.dahdiIncludeFile , async: false }).responseText;
+
+			var q = context2json({ configFile_output:s, context: 'general', usf:0 });
+			if( q === null ){ // if context 'general' is not found
+				ASTGUI.systemCmd( sessionData.directories.script_detectdahdi , function(){
+					sessionData.continueParsing = false ;
+					runScript_detectdahdi();
+					return;
+				});
+			}
+
 			if( s.contains('Response: Error') && s.contains('Message: Config file not found') ){
 				sessionData.continueParsing = false ;
 				ASTGUI.systemCmd( sessionData.directories.app_dahdi_genconf , function(){
@@ -198,14 +208,6 @@
 				});
 				return;
 			}else{
-				var q = context2json({ configFile_output:s, context: 'general', usf:0 });
-				if( q === null ){ // if context 'general' is not found
-					ASTGUI.systemCmd( sessionData.directories.script_detectdahdi , function(){
-						sessionData.continueParsing = false ;
-						runScript_detectdahdi();
-						return;
-					});
-				}
 				q.each(function(line){
 					if ( !line.beginsWith('fx') ){ return ;}
 					if( line.beginsWith('fxoks=') || line.beginsWith('fxsks=') ){