SONAR-4554 Kicked out of Issues filter when applying bulk change on a filter

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/issues_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/issues_controller.rb
index da39a9472f860d58ba8b096351858761106632a1..5015bd7503e5a6d32e5cccd039c0e8c99339dc15 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/issues_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/issues_controller.rb
@@ -33,12 +33,16 @@ class IssuesController < ApplicationController
 
   # GET /issues/search
   def search
+    @first_search = issues_query_params_sanitized.empty?
+    @issues_query_params = criteria_params
+
     if params[:id]
       @filter = find_filter(params[:id].to_i)
+      @first_search = false
+      issue_filter_result = Internal.issues.execute(params[:id].to_i, @issues_query_params)
+    else
+      issue_filter_result = Internal.issues.execute(@issues_query_params)
     end
-    @first_search = issues_query_params_sanitized.empty?
-    @issues_query_params = criteria_params
-    issue_filter_result = Internal.issues.execute(@issues_query_params)
     @issues_query = issue_filter_result.query
     @issues_result = issue_filter_result.result