IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(templating): fixed issue with mixing repeated row and repeated panel, fixes #4988

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-05-12 10:31:36 +02:00
parent 731c35540f
commit 0201ac24e7
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -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) * **Templating**: Fixed issue with new data source variable not persisting current selected value, fixes [#4934](https://github.com/grafana/grafana/issues/4934)

2
karma.conf.js
View File

@ -26,7 +26,7 @@ module.exports = function(config) {
browsers: ['PhantomJS'], browsers: ['PhantomJS'],
captureTimeout: 20000, captureTimeout: 20000,
singleRun: true, singleRun: true,
autoWatchBatchDelay: 10000, autoWatchBatchDelay: 1000,
browserNoActivityTimeout: 60000, browserNoActivityTimeout: 60000,
}); });

4
packaging/publish/publish.sh
View File

@ -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/6 grafana-${rpm_ver}.x86_64.rpm
#package_cloud push grafana/testing/el/7 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/7 grafana-${rpm_ver}.x86_64.rpm
package_cloud push grafana/stable/el/6 grafana-${version}.x86_64.rpm package_cloud push grafana/stable/el/6 grafana-${rpm_ver}.x86_64.rpm

3
public/app/features/dashboard/dynamicDashboardSrv.js
View File

@ -52,6 +52,8 @@ function (angular, _) {
else if (panel.repeatPanelId && panel.repeatIteration !== this.iteration) { else if (panel.repeatPanelId && panel.repeatIteration !== this.iteration) {
row.panels = _.without(row.panels, panel); row.panels = _.without(row.panels, panel);
j = j - 1; j = j - 1;
} else if (row.repeat || row.repeatRowId) {
continue;
} else if (!_.isEmpty(panel.scopedVars) && panel.repeatIteration !== this.iteration) { } else if (!_.isEmpty(panel.scopedVars) && panel.repeatIteration !== this.iteration) {
panel.scopedVars = {}; panel.scopedVars = {};
} }
@ -118,7 +120,6 @@ function (angular, _) {
panel = copy.panels[i]; panel = copy.panels[i];
panel.scopedVars = {}; panel.scopedVars = {};
panel.scopedVars[variable.name] = option; panel.scopedVars[variable.name] = option;
panel.repeatIteration = this.iteration;
} }
}, this); }, this);
}; };

1
public/test/specs/dynamicDashboardSrv-specs.js
View File

@ -167,6 +167,7 @@ define([
it('should generate a repeartRowId based on repeat row index', function() { it('should generate a repeartRowId based on repeat row index', function() {
expect(ctx.rows[1].repeatRowId).to.be(1); 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() { it('should set scopedVars on row panels', function() {