#248 Take into account the new case metrics format in dblist table

TheHive-Project · Jun 29, 2017 · 06f28ad · 06f28ad
1 parent a891111
commit 06f28ad
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/ui/app/scripts/controllers/admin/AdminMetricsCtrl.js b/ui/app/scripts/controllers/admin/AdminMetricsCtrl.js
@@ -15,9 +15,9 @@
                 ListSrv.query({
                     'listId': 'case_metrics'
                 }, {}, function(response) {
-
-                    $scope.metrics = _.values(response).filter(_.isString).map(function(item) {
-                        return JSON.parse(item);
+                    $scope.metrics = _.map(response.toJSON(), function(value, metricId) {
+                        value.id = metricId;
+                        return value;
                     });
 
                 }, function(response) {
@@ -30,7 +30,7 @@
                 ListSrv.save({
                         'listId': 'case_metrics'
                     }, {
-                        'value': JSON.stringify($scope.metric)
+                        'value': $scope.metric
                     }, function() {
                         $scope.initMetrics();
 

diff --git a/ui/app/scripts/services/MetricsCacheSrv.js b/ui/app/scripts/services/MetricsCacheSrv.js
@@ -27,14 +27,13 @@
 
                 if(metrics === null) {
                     resource.query({listId: 'case_metrics'}, {}, function(response) {
-                        metrics = {};
-                        var data = _.values(response).filter(_.isString).map(function(item) {
-                            return JSON.parse(item);
-                        });
+                        var json = response.toJSON();
 
-                        _.each(data, function(m){
-                            metrics[m.name] = m;
-                        });
+                        metrics = {};
+
+                        _.each(_.values(json), function(metric) {
+                            metrics[metric.name] = metric;
+                        })
 
                         deferred.resolve(metrics);
                     }, function(response) {

diff --git a/ui/app/views/partials/case/details/metrics.html b/ui/app/views/partials/case/details/metrics.html
@@ -18,7 +18,7 @@ <h4 class="vpad10 text-primary">
     </div>
 
     <dl class="dl-horizontal clear" ng-repeat="(k,v) in caze.metrics">
-        <dt class="pull-left" uib-tooltip="{{metricsCache[k].description}}">{{metricsCache[k].title}}</dt>
+        <dt class="pull-left" uib-tooltip="{{metricsCache[k].description}}">{{metricsCache[k].title || k}}</dt>
         <dd>
             <updatable-simple-text input-type="number" on-update="updateField('metrics.' + k, newValue)" value="caze.metrics[k]"></updatable-simple-text>
         </dd>