fix issues bulk change on contextualized pages, part 2

diff --git a/server/sonar-web/src/main/coffee/issues/controller.coffee b/server/sonar-web/src/main/coffee/issues/controller.coffee
index 59ea4c3cf0ceffd591931550f0ad6656a942f535..0e1c5efc36a626642d05b23768e4d19fb78de1dd 100644 (file)
--- a/server/sonar-web/src/main/coffee/issues/controller.coffee
+++ b/server/sonar-web/src/main/coffee/issues/controller.coffee
@@ -104,9 +104,9 @@ define [
       q
 
 
-    getQuery: (separator = '|') ->
+    getQuery: (separator = '|', addContext = false) ->
       filter = @options.app.state.get 'query'
-      _.extend filter, @options.app.state.get 'contextQuery' if @options.app.state.get 'isContext'
+      _.extend filter, @options.app.state.get 'contextQuery' if addContext && @options.app.state.get 'isContext'
       route = []
       _.map filter, (value, property) ->
         route.push '' + property + '=' + encodeURIComponent(value)

diff --git a/server/sonar-web/src/main/coffee/issues/workspace-header-view.coffee b/server/sonar-web/src/main/coffee/issues/workspace-header-view.coffee
index 795b8cdc2d3741d2a3e2c5d246d7f0aaf2364e7d..69e31378baef240d16e6c25a3b3a6454c63bbf2f 100644 (file)
--- a/server/sonar-web/src/main/coffee/issues/workspace-header-view.coffee
+++ b/server/sonar-web/src/main/coffee/issues/workspace-header-view.coffee
@@ -39,6 +39,6 @@ define [
 
 
     bulkChange: ->
-      query = @options.app.controller.getQuery '&'
+      query = @options.app.controller.getQuery '&', true
       url = "#{baseUrl}/issues/bulk_change_form?#{query}"
       openModalWindow url, {}