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

change option name more clearly

Browse Source
This commit is contained in:
Mitsuhiro Tanda 2016-03-08 18:13:40 +09:00
parent f11b4cb481
commit ba1e1532ac
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/templating/partials/editor.html
View File

@ -171,7 +171,7 @@
</div> </div>
<div class="gf-form"> <div class="gf-form">
<span class="gf-form-label width-7">Refresh</span> <span class="gf-form-label width-7">Refresh</span>
<select class="input-large tight-form-input" ng-model="current.refresh" ng-options="f for f in ['Never', 'On Dashboard Load', 'On Time Change']"></select> <select class="input-large tight-form-input" ng-model="current.refresh" ng-options="f for f in ['Never', 'On Dashboard Load', 'On Time Change and Dashboard Load']"></select>
<tip>When to update the values of this template, will slow down dashboard load / time change</tip> <tip>When to update the values of this template, will slow down dashboard load / time change</tip>
</div> </div>
</div> </div>

4
public/app/features/templating/templateValuesSrv.js
View File

@ -24,7 +24,7 @@ function (angular, _, kbn) {
var promises = []; var promises = [];
for (var i = 0; i < self.variables.length; i++) { for (var i = 0; i < self.variables.length; i++) {
var variable = self.variables[i]; var variable = self.variables[i];
if (variable.refresh === 'On Time Change') { if (variable.refresh === 'On Time Change and Dashboard Load') {
promises.push(self.updateOptions(variable)); promises.push(self.updateOptions(variable));
} }
} }
@ -71,7 +71,7 @@ function (angular, _, kbn) {
if (urlValue !== void 0) { if (urlValue !== void 0) {
return self.setVariableFromUrl(variable, urlValue).then(lock.resolve); return self.setVariableFromUrl(variable, urlValue).then(lock.resolve);
} }
else if (variable.refresh === 'On Dashboard Load' || variable.refresh === 'On Time Change') { else if (variable.refresh === 'On Dashboard Load' || variable.refresh === 'On Time Change and Dashboard Load') {
return self.updateOptions(variable).then(function() { return self.updateOptions(variable).then(function() {
if (_.isEmpty(variable.current) && variable.options.length) { if (_.isEmpty(variable.current) && variable.options.length) {
console.log("setting current for %s", variable.name); console.log("setting current for %s", variable.name);