From 0201ac24e768fa15c4d0cee46df5cadfbd283773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Thu, 12 May 2016 10:31:36 +0200
Subject: [PATCH] fix(templating): fixed issue with mixing repeated row and
 repeated panel, fixes #4988

---
 CHANGELOG.md                                         | 6 +++++-
 karma.conf.js                                        | 2 +-
 packaging/publish/publish.sh                         | 4 ++--
 public/app/features/dashboard/dynamicDashboardSrv.js | 3 ++-
 public/test/specs/dynamicDashboardSrv-specs.js       | 1 +
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dea2b9c5f31..fd2a4dd50a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,8 @@
-# 3.0.0 Stable (2016-05-11)
+# 3.0.2 Stable (unreleased)
+
+* **Templating**: Fixed issue mixing row repeat and panel repeats, fixes [#4988](https://github.com/grafana/grafana/issues/4988)
+
+# 3.0.1 Stable (2016-05-11)
 
 * **Templating**: Fixed issue with new data source variable not persisting current selected value, fixes [#4934](https://github.com/grafana/grafana/issues/4934)
 
diff --git a/karma.conf.js b/karma.conf.js
index c803dda5eae..cdcea23a90b 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -26,7 +26,7 @@ module.exports = function(config) {
     browsers: ['PhantomJS'],
     captureTimeout: 20000,
     singleRun: true,
-    autoWatchBatchDelay: 10000,
+    autoWatchBatchDelay: 1000,
     browserNoActivityTimeout: 60000,
 
   });
diff --git a/packaging/publish/publish.sh b/packaging/publish/publish.sh
index d2826366627..79da73d441a 100755
--- a/packaging/publish/publish.sh
+++ b/packaging/publish/publish.sh
@@ -18,5 +18,5 @@ rpm_ver=3.0.1-1
 #package_cloud push grafana/testing/el/6 grafana-${rpm_ver}.x86_64.rpm
 #package_cloud push grafana/testing/el/7 grafana-${rpm_ver}.x86_64.rpm
 
-package_cloud push grafana/stable/el/7 grafana-${version}.x86_64.rpm
-package_cloud push grafana/stable/el/6 grafana-${version}.x86_64.rpm
+package_cloud push grafana/stable/el/7 grafana-${rpm_ver}.x86_64.rpm
+package_cloud push grafana/stable/el/6 grafana-${rpm_ver}.x86_64.rpm
diff --git a/public/app/features/dashboard/dynamicDashboardSrv.js b/public/app/features/dashboard/dynamicDashboardSrv.js
index 9e369733f45..f131b47b557 100644
--- a/public/app/features/dashboard/dynamicDashboardSrv.js
+++ b/public/app/features/dashboard/dynamicDashboardSrv.js
@@ -52,6 +52,8 @@ function (angular, _) {
           else if (panel.repeatPanelId && panel.repeatIteration !== this.iteration) {
             row.panels = _.without(row.panels, panel);
             j = j - 1;
+          } else if (row.repeat || row.repeatRowId) {
+            continue;
           } else if (!_.isEmpty(panel.scopedVars) && panel.repeatIteration !== this.iteration) {
             panel.scopedVars = {};
           }
@@ -118,7 +120,6 @@ function (angular, _) {
           panel = copy.panels[i];
           panel.scopedVars = {};
           panel.scopedVars[variable.name] = option;
-          panel.repeatIteration = this.iteration;
         }
       }, this);
     };
diff --git a/public/test/specs/dynamicDashboardSrv-specs.js b/public/test/specs/dynamicDashboardSrv-specs.js
index b988203009a..a09c3788377 100644
--- a/public/test/specs/dynamicDashboardSrv-specs.js
+++ b/public/test/specs/dynamicDashboardSrv-specs.js
@@ -167,6 +167,7 @@ define([
 
     it('should generate a repeartRowId based on repeat row index', function() {
       expect(ctx.rows[1].repeatRowId).to.be(1);
+      expect(ctx.rows[1].repeatIteration).to.be(ctx.dynamicDashboardSrv.iteration);
     });
 
     it('should set scopedVars on row panels', function() {