Related-Bug: #1645159

Don't include interface/instance count from tor-agents in total interface/instances count Change-Id: I3fe394599f26a1212e947cdf0711af527e247c86 (cherry picked from commit 7badf26)
Juniper · Jan 9, 2017 · ad1ba28 · ad1ba28
1 parent 3635e29
commit ad1ba28
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/webroot/js/views/BarChartInfoView.js b/webroot/js/views/BarChartInfoView.js
@@ -29,10 +29,19 @@ define([
             $.each(data,function(idx,obj) {
                 for(var i=0;i<infoChartCfg.length;i++) {
                     var currField = infoChartCfg[i]['field'];
+                    var excludeList = infoChartCfg[i]['excludeList'];
                     if(idx == 0) {
                         totalCntMap[currField] = 0;
                     }
-                    totalCntMap[currField] += obj[currField]
+                    if(excludeList != null) {
+                        var doExclude = _.find(excludeList,function(currFilter) {
+                                return obj[currFilter['key']] == currFilter['value'];
+                            });
+                        if(doExclude == null) 
+                            totalCntMap[currField] += obj[currField];
+                    } else {
+                        totalCntMap[currField] += obj[currField];
+                    }
                 }
             });