From bbe018567f17669b7d6c23c312ebbea1ca749b45 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 22 Jan 2014 14:58:23 +0100
Subject: [PATCH] Dashboard: Render exceptions on failing requests

refs #5507
---
 public/js/icinga/components/dashboard.js | 34 +++++++++++++-----------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/public/js/icinga/components/dashboard.js b/public/js/icinga/components/dashboard.js
index 4f221c006..a63fdb864 100644
--- a/public/js/icinga/components/dashboard.js
+++ b/public/js/icinga/components/dashboard.js
@@ -44,22 +44,26 @@ define(['jquery', 'logging', 'URIjs/URI', 'icinga/componentLoader'], function($,
         /**
          * Refresh the container content and layout
          */
-        this.refresh = function() {
+        this.refresh = function () {
             $.ajax({
-                url: this.dashboardUrl
-            }).done((function(response) {
-                this.container.empty();
-                this.container.html(response);
-                dashboardContainer.freetile('layout');
-                $(window).on('layoutchange', function() {
+                url: this.dashboardUrl,
+                context: this
+            })
+                .done(function (response) {
+                    this.container.empty();
+                    this.container.html(response);
+                    components.load();
+                })
+                .fail(function (response, reason) {
+                    this.container.html(response.responseText);
+                })
+                .always(function () {
                     dashboardContainer.freetile('layout');
-                });
-
-                this.triggerRefresh();
-                components.load();
-            }).bind(this)).fail((function(response, reason) {
-                this.container.html(response);
-            }).bind(this));
+                    $(window).on('layoutchange', function() {
+                        dashboardContainer.freetile('layout');
+                    });
+                    this.triggerRefresh();
+                })
         };
 
         this.triggerRefresh = function() {
@@ -70,4 +74,4 @@ define(['jquery', 'logging', 'URIjs/URI', 'icinga/componentLoader'], function($,
         };
         this.refresh();
     };
-});
\ No newline at end of file
+});