#312 Add 520 error handling to dashboard list and view routes

TheHive-Project · Dec 1, 2017 · fffd084 · fffd084
1 parent d7d7253
commit fffd084
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/ui/app/scripts/app.js b/ui/app/scripts/app.js
@@ -300,20 +300,31 @@ angular.module('thehive', ['ngAnimate', 'ngMessages', 'ngSanitize', 'ui.bootstra
                 controller: 'DashboardViewCtrl',
                 controllerAs: '$vm',
                 resolve: {
-                    dashboard: function(DashboardSrv, $stateParams, $q) {
+                    dashboard: function(NotificationSrv, DashboardSrv, $stateParams, $q) {
                         var defer = $q.defer();
 
                         DashboardSrv.get($stateParams.id)
                             .then(function(response) {
                                 defer.resolve(response.data);
                             }, function(err) {
+                                NotificationSrv.error('DashboardViewCtrl', err.data, err.status);
                                 defer.reject(err);
                             });
 
                         return defer.promise;
                     },
-                    metadata: function(DashboardSrv) {
-                        return DashboardSrv.getMetadata();
+                    metadata: function($q, DashboardSrv, NotificationSrv) {
+                        var defer = $q.defer();
+
+                        DashboardSrv.getMetadata()
+                            .then(function(response) {
+                                defer.resolve(response);
+                            }, function(err) {
+                                NotificationSrv.error('DashboardViewCtrl', err.data, err.status);
+                                defer.reject(err);
+                            });
+
+                        return defer.promise;
                     }
                 }
             });

diff --git a/ui/app/scripts/controllers/dashboard/DashboardsCtrl.js b/ui/app/scripts/controllers/dashboard/DashboardsCtrl.js
@@ -58,6 +58,8 @@
             this.load = function() {
                 DashboardSrv.list().then(function(response) {
                     self.dashboards = response.data;
+                }, function(err){
+                    NotificationSrv.error('DashboardsCtrl', err.data, err.status);
                 });
             };