From: Stas Vilchik <vilchiks@gmail.com>
Date: Mon, 23 Feb 2015 14:05:07 +0000 (+0100)
Subject: fix issues bulk change on contextualized pages, part 2
X-Git-Tag: 5.1-RC1~96
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4600be9e7eb4080fa43e1a550e3c4b855efe38a7;p=sonarqube.git

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 59ea4c3cf0c..0e1c5efc36a 100644
--- 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 795b8cdc2d3..69e31378bae 100644
--- 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, {}