FIX: Fixed broken error message in case of communication issue during…

… updates
NagVis · Dec 31, 2016 · dd8909f · dd8909f
1 parent b2d9c5c
commit dd8909f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -14,6 +14,7 @@ Frontend:
   * FIX: Fixed wrong visualization (hover text, line color) of acknowledged services
   * FIX: Overview page: Fixed disappearing maps on state changes
   * FIX: Sidebar menu: Deleted maps were still visible in sidebar
+  * FIX: Fixed broken error message in case of communication issue during updates
 
 1.9b10
 Core:

diff --git a/share/frontend/nagvis-js/js/ajax.js b/share/frontend/nagvis-js/js/ajax.js
@@ -27,6 +27,18 @@ function call_ajax(url, args)
         add_ajax_id      : true,
         response_handler : null,
         error_handler    : function(status_code, response, handler_data) {
+            if (response === null) {
+                response = {
+                    'type'    : 'error',
+                    'title'   : 'Network error',
+                    'message' : "Failed to execute ajax call. Maybe a network issue or webserver is not available."
+                          + "<div class=details>\n"
+                          + "HTTP-Status-Code: " + status_code + "<br />\n"
+                          + "Time: " + iNow + "<br />\n"
+                          + "URL: <code>" + url.replace(/</g, '&lt;') + "</code><br />\n"
+                          + "</div>"
+                };
+            }
             frontendMessage(response, 'serverError');
         },
         handler_data     : null,

diff --git a/share/frontend/nagvis-js/js/frontendMessage.js b/share/frontend/nagvis-js/js/frontendMessage.js
@@ -35,6 +35,10 @@ function frontendMessageRemove(key) {
 }
 
 function frontendMessage(oMessage, key) {
+    if (oMessage === null) {
+        throw "Could not display empty frontendMessage()";
+    }
+
     var sTitle = '';
     if (typeof oMessage.title !== 'undefined')
         sTitle = oMessage.title;