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

Small fixes for template variable groups (tags)

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-06-02 14:39:21 +02:00
parent b0451dc1b3
commit 8934c83742
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/directives/variableValueSelect.js
View File

@ -26,6 +26,8 @@ function (angular, app, _) {
return option; return option;
}); });
_.sortBy(vm.options, 'text');
vm.selectedValues = _.filter(vm.options, {selected: true}); vm.selectedValues = _.filter(vm.options, {selected: true});
if (!vm.tags) { if (!vm.tags) {

2
public/app/features/dashboard/partials/variableValueSelect.html
View File

@ -2,8 +2,8 @@
<a ng-click="vm.show()" class="variable-value-link tight-form-item"> <a ng-click="vm.show()" class="variable-value-link tight-form-item">
{{vm.linkText}} {{vm.linkText}}
<span class="label-tag" ng-repeat="tag in vm.selectedTags" tag-color-from-name="tag.text"> <span class="label-tag" ng-repeat="tag in vm.selectedTags" tag-color-from-name="tag.text">
{{tag.text}}
&nbsp;&nbsp;<i class="fa fa-tag"></i>&nbsp; &nbsp;&nbsp;<i class="fa fa-tag"></i>&nbsp;
{{tag.text}}
</span> </span>
<i class="fa fa-caret-down"></i> <i class="fa fa-caret-down"></i>
</a> </a>

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

@ -153,6 +153,7 @@ function (angular, _, kbn) {
}); });
}); });
} else { } else {
delete variable.tags;
return queryPromise; return queryPromise;
} }
}); });