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

added comment, variableChange -> variableValueChange

Browse Source
This commit is contained in:
Patrick O'Carroll 2018-06-04 15:35:34 +02:00
parent 609b0fa498
commit b122f53085
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
public/app/features/dashboard/save_modal.ts
View File

@ -16,13 +16,13 @@ const template = `
<form name="ctrl.saveForm" ng-submit="ctrl.save()" class="modal-content" novalidate> <form name="ctrl.saveForm" ng-submit="ctrl.save()" class="modal-content" novalidate>
<div class="p-t-1"> <div class="p-t-1">
<div class="gf-form-group" ng-if="ctrl.timeChange || ctrl.variableChange"> <div class="gf-form-group" ng-if="ctrl.timeChange || ctrl.variableValueChange">
<gf-form-switch class="gf-form" <gf-form-switch class="gf-form"
label="Save current time range" ng-if="ctrl.timeChange" label-class="width-12" switch-class="max-width-6" label="Save current time range" ng-if="ctrl.timeChange" label-class="width-12" switch-class="max-width-6"
checked="ctrl.saveTimerange" on-change="buildUrl()"> checked="ctrl.saveTimerange" on-change="buildUrl()">
</gf-form-switch> </gf-form-switch>
<gf-form-switch class="gf-form" <gf-form-switch class="gf-form"
label="Save current variables" ng-if="ctrl.variableChange" label-class="width-12" switch-class="max-width-6" label="Save current variables" ng-if="ctrl.variableValueChange" label-class="width-12" switch-class="max-width-6"
checked="ctrl.saveVariables" on-change="buildUrl()"> checked="ctrl.saveVariables" on-change="buildUrl()">
</gf-form-switch> </gf-form-switch>
</div> </div>
@ -70,7 +70,7 @@ export class SaveDashboardModalCtrl {
saveForm: any; saveForm: any;
dismiss: () => void; dismiss: () => void;
timeChange = false; timeChange = false;
variableChange = false; variableValueChange = false;
/** @ngInject */ /** @ngInject */
constructor(private dashboardSrv) { constructor(private dashboardSrv) {
@ -91,21 +91,24 @@ export class SaveDashboardModalCtrl {
} }
compareTemplating() { compareTemplating() {
//checks if variables has been added or removed, if so variables will be saved automatically
if (this.dashboardSrv.dash.originalTemplating.length !== this.dashboardSrv.dash.templating.list.length) { if (this.dashboardSrv.dash.originalTemplating.length !== this.dashboardSrv.dash.templating.list.length) {
return (this.variableChange = false); return (this.variableValueChange = false);
} }
//checks if variable value has changed
if (this.dashboardSrv.dash.templating.list.length > 0) { if (this.dashboardSrv.dash.templating.list.length > 0) {
for (let i = 0; i < this.dashboardSrv.dash.templating.list.length; i++) { for (let i = 0; i < this.dashboardSrv.dash.templating.list.length; i++) {
if ( if (
this.dashboardSrv.dash.templating.list[i].current.text !== this.dashboardSrv.dash.templating.list[i].current.text !==
this.dashboardSrv.dash.originalTemplating[i].current.text this.dashboardSrv.dash.originalTemplating[i].current.text
) { ) {
return (this.variableChange = true); return (this.variableValueChange = true);
} }
} }
return (this.variableChange = false); return (this.variableValueChange = false);
} else { } else {
return (this.variableChange = false); return (this.variableValueChange = false);
} }
} }