From bf4c11d4d9191ec479796c912d5d37639cf9f418 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Tue, 17 Dec 2013 13:12:52 +0600 Subject: [PATCH] Measures Components: change default value to "any" --- .../webapp/javascripts/navigator/filters/select-filters.js | 4 +++- .../src/main/webapp/javascripts/navigator/measures-app.js | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sonar-server/src/main/webapp/javascripts/navigator/filters/select-filters.js b/sonar-server/src/main/webapp/javascripts/navigator/filters/select-filters.js index 0c5126ffe58..a8c6862bbe7 100644 --- a/sonar-server/src/main/webapp/javascripts/navigator/filters/select-filters.js +++ b/sonar-server/src/main/webapp/javascripts/navigator/filters/select-filters.js @@ -238,7 +238,9 @@ window.SS = typeof window.SS === 'object' ? window.SS : {}; var value = this.selection.map(function(item) { return item.get('text'); }), - defaultValue = this.model.get('multiple') ? window.SS.phrases.all : window.SS.phrases.any; + defaultValue = this.model.has('defaultValue') ? + this.model.get('defaultValue') : + this.model.get('multiple') ? window.SS.phrases.all : window.SS.phrases.any; return this.isDefaultValue() ? defaultValue : value.join(', '); }, diff --git a/sonar-server/src/main/webapp/javascripts/navigator/measures-app.js b/sonar-server/src/main/webapp/javascripts/navigator/measures-app.js index 03321fd7dfc..5ba1c22e912 100644 --- a/sonar-server/src/main/webapp/javascripts/navigator/measures-app.js +++ b/sonar-server/src/main/webapp/javascripts/navigator/measures-app.js @@ -36,7 +36,8 @@ window.SS = typeof window.SS === 'object' ? window.SS : {}; type: window.SS.SelectFilterView, enabled: true, optional: false, - choices: window.SS.qualifiers + choices: window.SS.qualifiers, + defaultValue: window.SS.phrases.any }), new window.SS.Filter({ -- 2.39.5