Merge pull request #357 from alexanderlz/master

Bug #303: 'Show Total' duplicates values on multiple runs
getredash · Jan 25, 2015 · 9dc3a35 · 9dc3a35
2 parents f8878d3 + 4a8a448
commit 9dc3a35
Showing 1 changed file with 20 additions and 10 deletions.
diff --git a/rd_ui/app/scripts/ng_highchart.js b/rd_ui/app/scripts/ng_highchart.js
@@ -126,20 +126,30 @@
             {
               text: 'Show Total',
               onclick: function () {
+                var hasTotalsAlready = _.some(this.series, function (s) {
+                    var res = (s.name == 'Total');
+                    //if 'Total' already exists - just make it visible
+                    if (res) s.setVisible(true, false);
+                    return res;
+                })
                 var data = {};
                 _.each(this.series, function (s) {
-                  s.setVisible(false, false);
-                  _.each(s.data, function (p) {
-                    data[p.x] = data[p.x] || {'x': p.x, 'y': 0};
-                    data[p.x].y = data[p.x].y + p.y;
-                  });
+                  if (s.name != 'Total') s.setVisible(false, false);
+                  if (!hasTotalsAlready) {
+                      _.each(s.data, function (p) {
+                        data[p.x] = data[p.x] || {'x': p.x, 'y': 0};
+                        data[p.x].y = data[p.x].y + p.y;
+                      }); 
+                  }
                 });
 
-                this.addSeries({
-                  data: _.values(data),
-                  type: 'line',
-                  name: 'Total'
-                }, false)
+                if (!hasTotalsAlready) {
+                    this.addSeries({
+                      data: _.values(data),
+                      type: 'line',
+                      name: 'Total'
+                    }, false)
+                }
 
                 this.redraw();
               }