aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-web
diff options
context:
space:
mode:
authorStas Vilchik <vilchiks@gmail.com>2014-10-30 10:36:21 +0100
committerStas Vilchik <vilchiks@gmail.com>2014-10-30 10:36:30 +0100
commit1b485b7d0f6b970e7c3d0051bff12fe2238ce141 (patch)
tree4dfe9e813751ae956a4143f6be8f89848ecd8bae /server/sonar-web
parentec43e0e73e765caf522323c4b656f42f704abefd (diff)
downloadsonarqube-1b485b7d0f6b970e7c3d0051bff12fe2238ce141.tar.gz
sonarqube-1b485b7d0f6b970e7c3d0051bff12fe2238ce141.zip
SONAR-5718 Disable facet when collapse it
Diffstat (limited to 'server/sonar-web')
-rw-r--r--server/sonar-web/src/main/coffee/issues/controller.coffee1
-rw-r--r--server/sonar-web/src/main/coffee/issues/facets/assignee-facet.coffee4
-rw-r--r--server/sonar-web/src/main/coffee/issues/facets/base-facet.coffee7
-rw-r--r--server/sonar-web/src/main/coffee/issues/facets/resolution-facet.coffee4
4 files changed, 16 insertions, 0 deletions
diff --git a/server/sonar-web/src/main/coffee/issues/controller.coffee b/server/sonar-web/src/main/coffee/issues/controller.coffee
index 8ccf17ef760..6da72daaef6 100644
--- a/server/sonar-web/src/main/coffee/issues/controller.coffee
+++ b/server/sonar-web/src/main/coffee/issues/controller.coffee
@@ -88,6 +88,7 @@ define [
disableFacet: (id) ->
facet = @options.app.facets.get id
facet.set enabled: false
+ @options.app.facetsView.children.findByModel(facet).disable()
toggleFacet: (id) ->
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 b9bbcdfb4fe..7d6c15dd8af 100644
--- a/server/sonar-web/src/main/coffee/issues/facets/assignee-facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets/assignee-facet.coffee
@@ -45,6 +45,10 @@ define [
values
+ disable: ->
+ @options.app.state.updateFilter assigned: null, assignees: null
+
+
serializeData: ->
_.extend super,
values: @getValuesWithLabels()
diff --git a/server/sonar-web/src/main/coffee/issues/facets/base-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/base-facet.coffee
index e8e50066c26..d5a779312fc 100644
--- a/server/sonar-web/src/main/coffee/issues/facets/base-facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets/base-facet.coffee
@@ -48,3 +48,10 @@ define [
obj = {}
obj[property] = value
@options.app.state.updateFilter obj
+
+
+ disable: ->
+ property = @model.get 'property'
+ obj = {}
+ obj[property] = null
+ @options.app.state.updateFilter obj
diff --git a/server/sonar-web/src/main/coffee/issues/facets/resolution-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/resolution-facet.coffee
index a51aa4ab796..528e3b95fbf 100644
--- a/server/sonar-web/src/main/coffee/issues/facets/resolution-facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets/resolution-facet.coffee
@@ -32,6 +32,10 @@ define [
@options.app.state.updateFilter resolved: null, resolutions: @getValue()
+ disable: ->
+ @options.app.state.updateFilter resolved: null, resolutions: null
+
+
sortValues: (values) ->
order = ['FIXED', 'FALSE-POSITIVE', 'CLOSED']
_.sortBy values, (v) -> order.indexOf v.val