Commit 49481039 by Torkel Ödegaard

feat(templating): new template variable selection dropdown now supports…

feat(templating): new template variable selection dropdown now supports accepting custom values that are not an actual selectable value, Fixes #2344
parent 8daec7bd
...@@ -107,10 +107,14 @@ function (angular, app, _) { ...@@ -107,10 +107,14 @@ function (angular, app, _) {
vm.moveHighlight(-1); vm.moveHighlight(-1);
} }
if (evt.keyCode === 13) { 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) { 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, _) { ...@@ -189,8 +193,12 @@ function (angular, app, _) {
}; };
vm.commitChanges = function() { vm.commitChanges = function() {
// make sure one option is selected // if we have a search query and no options use that
if (vm.selectedValues.length === 0) { 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.options[0].selected = true;
vm.selectionsChanged(false); vm.selectionsChanged(false);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment