Fixed state issue with variable value dropdown, grafana#2080

torkelo · torkelo · commit 604f8a22f732 · 2015-06-09T10:22:43.000+02:00
diff --git a/public/app/directives/valueSelectDropdown.js b/public/app/directives/valueSelectDropdown.js
@@ -34,7 +34,7 @@ function (angular, app, _) {
           var tag = { text: value, selected: false };
           _.each(vm.variable.current.tags, function(tagObj) {
             if (tagObj.text === value) {
-              tag.selected = true;
+              tag = tagObj;
             }
           });
           return tag;
diff --git a/public/test/specs/valueSelectDropdown-specs.js b/public/test/specs/valueSelectDropdown-specs.js
@@ -138,7 +138,7 @@ function () {
     describe("Given variable with selected tags", function() {
       beforeEach(function() {
         ctrl.variable = {
-          current: {text: 'server-1', value: 'server-1', tags: [{text: 'key1'}] },
+          current: {text: 'server-1', value: 'server-1', tags: [{text: 'key1', selected: true}] },
           options: [
             {text: 'server-1', value: 'server-1'},
             {text: 'server-2', value: 'server-2'},

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ function (angular, app, _) {`
`34`	`34`	`var tag = { text: value, selected: false };`
`35`	`35`	`_.each(vm.variable.current.tags, function(tagObj) {`
`36`	`36`	`if (tagObj.text === value) {`
`37`		`- tag.selected = true;`
	`37`	`+ tag = tagObj;`
`38`	`38`	`}`
`39`	`39`	`});`
`40`	`40`	`return tag;`