From 0c7eee20e822809717b151c0844e34a7cfa1563b Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Tue, 26 Nov 2013 11:22:01 +0600 Subject: [PATCH] SONAR-4851 Some fixes --- .../navigator/filters/ajax-select-filters.js | 15 ++++++++++----- .../src/main/webapp/stylesheets/navigator.css | 1 + .../src/main/webapp/stylesheets/navigator.less | 1 + 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/sonar-server/src/main/webapp/javascripts/navigator/filters/ajax-select-filters.js b/sonar-server/src/main/webapp/javascripts/navigator/filters/ajax-select-filters.js index 7720feda5f0..f122a021950 100644 --- a/sonar-server/src/main/webapp/javascripts/navigator/filters/ajax-select-filters.js +++ b/sonar-server/src/main/webapp/javascripts/navigator/filters/ajax-select-filters.js @@ -261,10 +261,15 @@ window.SS = typeof window.SS === 'object' ? window.SS : {}; var AssigneeDetailsFilterView = AjaxSelectDetailsFilterView.extend({ resetChoices: function() { - this.options.filterView.choices.reset([{ - id: '', - text: 'Unassigned' - }]); + if (this.options.filterView.selection.findWhere({ id: '' })) { + this.options.filterView.choices.reset([]); + } else { + this.options.filterView.choices.reset([{ + id: '', + text: 'Unassigned' + }]); + } + }, @@ -289,7 +294,7 @@ window.SS = typeof window.SS === 'object' ? window.SS : {}; }, - restoreFromText: function(value, text) { + restoreFromText: function(value) { if (_.indexOf(value, '') !== -1) { this.choices.reset([]); } diff --git a/sonar-server/src/main/webapp/stylesheets/navigator.css b/sonar-server/src/main/webapp/stylesheets/navigator.css index 9c4a7643e87..9adaf436e25 100644 --- a/sonar-server/src/main/webapp/stylesheets/navigator.css +++ b/sonar-server/src/main/webapp/stylesheets/navigator.css @@ -150,6 +150,7 @@ background: #cdcdcd; } .navigator-filter-select-list:not(.hidden) + .navigator-filter-select-list { + margin-top: 5px; border-top: 1px solid #cdcdcd; } .navigator-filter-search { diff --git a/sonar-server/src/main/webapp/stylesheets/navigator.less b/sonar-server/src/main/webapp/stylesheets/navigator.less index 1fa41de1438..4305835d20f 100644 --- a/sonar-server/src/main/webapp/stylesheets/navigator.less +++ b/sonar-server/src/main/webapp/stylesheets/navigator.less @@ -179,6 +179,7 @@ } .navigator-filter-select-list:not(.hidden) + .navigator-filter-select-list { + margin-top: 5px; border-top: 1px solid @darkGrey; } -- 2.39.5