IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-30 20:54:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix repeat panels (#5796)

Browse Source
This commit is contained in:
Julian Einwag 2016-08-14 13:50:49 +02:00 committed by Torkel Ödegaard
parent 0d26bc63ae
commit cbf0e77add
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/features/dashboard/dynamic_dashboard_srv.ts
View File

@ -54,6 +54,8 @@ export class DynamicDashboardSrv {
// clean up old left overs
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 = {};
}
@ -120,7 +122,6 @@ export class DynamicDashboardSrv {
panel = copy.panels[i];
panel.scopedVars = {};
panel.scopedVars[variable.name] = option;
panel.repeatIteration = this.iteration;
}
});
}

1
public/app/features/dashboard/specs/dynamic_dashboard_srv_specs.ts
View File

@ -165,6 +165,7 @@ dynamicDashScenario('given dashboard with row repeat', function(ctx) {
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() {