#113 Refresh the report templates list on add/remove template

TheHive-Project · Feb 9, 2017 · 93641cd · 93641cd
1 parent 70c4769
commit 93641cd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/ui/app/scripts/controllers/admin/AdminReportTemplatesCtrl.js b/ui/app/scripts/controllers/admin/AdminReportTemplatesCtrl.js
@@ -24,10 +24,19 @@
                 self.templates = response[0].data;
                 self.analyzers = response[1];
 
+                var cleared = _.mapObject(self.analyzers, function(val) {
+                    delete val.shortReport;
+                    delete val.longReport;
+
+                    return val;
+                });
+
+                self.analyzers = cleared;
+
                 return $q.resolve(self.analyzers);
             }).then(function (analyzersMap) {
                 if(_.isEmpty(analyzersMap)) {
-                    _.each(_.pluck(self.templates, 'analyzers'), function(item) {
+                    _.each(_.pluck(self.templates, 'analyzerId'), function(item) {
                         analyzersMap[item] = {
                             id: item
                         };
@@ -37,7 +46,7 @@
                 _.each(self.templates, function (tpl) {
                     if(analyzersMap[tpl.analyzerId]) {
                         analyzersMap[tpl.analyzerId][tpl.reportType + 'Report'] = tpl;
-                    }                    
+                    }
                 });
 
                 self.analyzerCount = _.keys(analyzersMap).length;

diff --git a/ui/app/scripts/services/AnalyzerSrv.js b/ui/app/scripts/services/AnalyzerSrv.js
@@ -29,7 +29,10 @@
                         resource.query({
                             range: 'all'
                         }, {}, function (response) {
-                            analyzers = _.indexBy(response, 'id');
+
+                            analyzers = _.indexBy(_.map(response, function(item) {
+                                return item.toJSON();
+                            }), 'id');
 
                             deferred.resolve(analyzers);
                         }, function (/*rejection*/) {