SONAR-5718 Don't allow to choose 'unassigned' and assignee at the same time

diff --git a/server/sonar-web/src/main/coffee/issues/facets-view.coffee b/server/sonar-web/src/main/coffee/issues/facets-view.coffee
index 30811e790d7cd759d08582d59405c9544b280daa..d0f91d9a8cc5b42a39209d573cb488959a723c2a 100644 (file)
--- a/server/sonar-web/src/main/coffee/issues/facets-view.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets-view.coffee
@@ -49,6 +49,5 @@ define [
     updateState: ->
       enabledFacets = @collection.filter (model) -> model.get('enabled')
       enabledFacetIds = enabledFacets.map (model) -> model.id
-      console.log enabledFacetIds
       @options.app.state.set facets: enabledFacetIds
 

diff --git a/server/sonar-web/src/main/coffee/issues/facets/assignee-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/assignee-facet.coffee
index 0c922e9ba5efc61edd4468f6fbc0f8b418656dda..b9bbcdfb4fe10d56e19b59d7b54050b990f773a7 100644 (file)
--- a/server/sonar-web/src/main/coffee/issues/facets/assignee-facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets/assignee-facet.coffee
@@ -23,15 +23,13 @@ define [
 
     toggleFacet: (e) ->
       unassigned = $(e.currentTarget).is "[data-unassigned]"
+      $(e.currentTarget).toggleClass 'active'
       if unassigned
-        $(e.currentTarget).toggleClass 'active'
         checked = $(e.currentTarget).is '.active'
-        if checked
-          @options.app.state.updateFilter assigned: 'false', assignees: null
-        else
-          @options.app.state.updateFilter assigned: null, assignees: null
+        value = if checked then 'false' else null
+        @options.app.state.updateFilter assigned: value, assignees: null
       else
-        super
+        @options.app.state.updateFilter assigned: null, assignees: @getValue()
 
 
     getValuesWithLabels: ->