IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-28 03:34:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat(templating): new template variable selection dropdown now supports accepting custom values that are not an actual selectable value, Fixes #2344

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-07-15 17:21:54 +02:00
parent 8daec7bde2
commit 494810393a
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
public/app/directives/valueSelectDropdown.js
View File

@ -107,10 +107,14 @@ function (angular, app, _) {
vm.moveHighlight(-1);
}
if (evt.keyCode === 13) {
vm.optionSelected(vm.search.options[vm.highlightIndex], {}, true, false);
if (vm.search.options.length === 0) {
vm.commitChanges();
} else {
vm.selectValue(vm.search.options[vm.highlightIndex], {}, true, false);
}
}
if (evt.keyCode === 32) {
vm.optionSelected(vm.search.options[vm.highlightIndex], {}, false, false);
vm.selectValue(vm.search.options[vm.highlightIndex], {}, false, false);
}
};
@ -189,8 +193,12 @@ function (angular, app, _) {
};
vm.commitChanges = function() {
// make sure one option is selected
if (vm.selectedValues.length === 0) {
// if we have a search query and no options use that
if (vm.search.options.length === 0 && vm.search.query.length > 0) {
vm.variable.current = {text: vm.search.query, value: vm.search.query};
}
else if (vm.selectedValues.length === 0) {
// make sure one option is selected
vm.options[0].selected = true;
vm.selectionsChanged(false);
}