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(singletat): Support repeated template variables in prefix/postfix, fixes #6595

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-11-16 18:44:39 +01:00
parent e6776f71d9
commit 4581bb4a7a
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -6,6 +6,9 @@
* **UI/Browser**: Fixed issue with page/view header gradient border not showing in Safari, [#6530](https://github.com/grafana/grafana/issues/6530) * **UI/Browser**: Fixed issue with page/view header gradient border not showing in Safari, [#6530](https://github.com/grafana/grafana/issues/6530)
* **UX**: Panel Drop zone visible after duplicating panel, and when entering fullscreen/edit view, [#6598](https://github.com/grafana/grafana/issues/6598) * **UX**: Panel Drop zone visible after duplicating panel, and when entering fullscreen/edit view, [#6598](https://github.com/grafana/grafana/issues/6598)
### Enhancements
* **Singlestat**: Support repeated template variables in prefix/postfix [#6595](https://github.com/grafana/grafana/issues/6595)
# 4.0-beta1 (2016-11-09) # 4.0-beta1 (2016-11-09)
### Enhancements ### Enhancements

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

@ -64,6 +64,8 @@ export class DynamicDashboardSrv {
j = j - 1; j = j - 1;
} }
} }
row.panelSpanChanged();
} }
} }

9
public/app/plugins/panel/singlestat/module.ts
View File

@ -208,11 +208,8 @@ class SingleStatCtrl extends MetricsPanelCtrl {
} }
// Add $__name variable for using in prefix or postfix // Add $__name variable for using in prefix or postfix
data.scopedVars = { data.scopedVars = _.extend({}, this.panel.scopedVars);
__name: { data.scopedVars["__name"] = {value: this.series[0].label};
value: this.series[0].label
}
};
} }
// check value to text mappings if its enabled // check value to text mappings if its enabled
@ -526,7 +523,7 @@ class SingleStatCtrl extends MetricsPanelCtrl {
elem.toggleClass('pointer', panel.links.length > 0); elem.toggleClass('pointer', panel.links.length > 0);
if (panel.links.length > 0) { if (panel.links.length > 0) {
linkInfo = linkSrv.getPanelLinkAnchorInfo(panel.links[0], panel.scopedVars); linkInfo = linkSrv.getPanelLinkAnchorInfo(panel.links[0], data.scopedVars);
} else { } else {
linkInfo = null; linkInfo = null;
} }