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

DashboardRow: Update to use the new replaceWithText method (#27671)

Browse Source 
* DashboardRow: Update to use the new replaceWithText method

* Fixed panel header as well
This commit is contained in:
Torkel Ödegaard 2020-09-21 15:27:23 +02:00 committed by GitHub
parent 04a09dc60a
commit 1e5309a788
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/dashboard/components/DashboardRow/DashboardRow.tsx
View File

@ -69,7 +69,7 @@ export class DashboardRow extends React.Component<DashboardRowProps, any> {
'dashboard-row--collapsed': this.state.collapsed, 'dashboard-row--collapsed': this.state.collapsed,
}); });
const title = templateSrv.replaceWithText(this.props.panel.title, this.props.panel.scopedVars); const title = templateSrv.replace(this.props.panel.title, this.props.panel.scopedVars, 'text');
const count = this.props.panel.panels ? this.props.panel.panels.length : 0; const count = this.props.panel.panels ? this.props.panel.panels.length : 0;
const panels = count === 1 ? 'panel' : 'panels'; const panels = count === 1 ? 'panel' : 'panels';
const canEdit = this.props.dashboard.meta.canEdit === true; const canEdit = this.props.dashboard.meta.canEdit === true;

2
public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx
View File

@ -131,7 +131,7 @@ export class PanelHeader extends Component<Props, State> {
render() { render() {
const { panel, scopedVars, error, isViewing, isEditing, data, alertState } = this.props; const { panel, scopedVars, error, isViewing, isEditing, data, alertState } = this.props;
const { menuItems } = this.state; const { menuItems } = this.state;
const title = templateSrv.replaceWithText(panel.title, scopedVars); const title = templateSrv.replace(panel.title, scopedVars, 'text');
const panelHeaderClass = classNames({ const panelHeaderClass = classNames({
'panel-header': true, 'panel-header': true,