[fusion-commits] r2825 - in sandbox/robust_error_handling: lib text

[svn_fusion at osgeo.org]

Author: jng
Date: 2013-11-28 05:28:45 -0800 (Thu, 28 Nov 2013)
New Revision: 2825

Modified:
   sandbox/robust_error_handling/lib/ApplicationDefinition.js
   sandbox/robust_error_handling/text/en.json
Log:
#576: Error out fatally if CreateSession.php returns nothing as we need a valid session id (which is script is supposed to create) in order to continue.

Modified: sandbox/robust_error_handling/lib/ApplicationDefinition.js
===================================================================
--- sandbox/robust_error_handling/lib/ApplicationDefinition.js	2013-11-28 12:51:39 UTC (rev 2824)
+++ sandbox/robust_error_handling/lib/ApplicationDefinition.js	2013-11-28 13:28:45 UTC (rev 2825)
@@ -152,7 +152,11 @@
         this.sessionId = o.sessionId;
         Fusion.sessionId = this.sessionId;
       }
-      this.getAppDef();
+      //We must have a session id established in order to continue here
+      if (this.sessionId)
+        this.getAppDef();
+      else
+        Fusion.reportFatalError("Call to CreateSession.php failed");
     },
 
     getAppDef: function(){

Modified: sandbox/robust_error_handling/text/en.json
===================================================================
--- sandbox/robust_error_handling/text/en.json	2013-11-28 12:51:39 UTC (rev 2824)
+++ sandbox/robust_error_handling/text/en.json	2013-11-28 13:28:45 UTC (rev 2825)
@@ -5,6 +5,8 @@
                   'Make sure that you have copied config_dist.json to config.json ' +
                   'and have configured the settings for your system',
 'pingFailure': 'Failed to keep session alive: ${message}',
+'sessionExpired': 'Your current MapGuide session has expired',
+'reload': 'Reload this application',
 'createSessionFailure': 'Failed to create session: ${message}',
 'ajaxError': 'Exception occurred in AJAX callback.\nMessage: ${exception}\nLocation: ${filename} (${line})\nResponse: ${response}',
 'detailedErrorTemplateHtml': '<h3>${name}</h3><br/>Error Details:<pre>${message}</pre><br/>Stack Trace:<br/><pre>${stacktrace}</pre><br/>Source: <pre>${source}</pre>',