From: Julien Lancelot <julien.lancelot@gmail.com>
Date: Tue, 13 Aug 2013 09:51:03 +0000 (+0200)
Subject: SONAR-4554 Kicked out of Issues filter when applying bulk change on a filter
X-Git-Tag: 3.7.1-RC1-~116
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f857f5589f3bf8503ae3d8f000ae59c52a66f5fd;p=sonarqube.git

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 da39a9472f8..5015bd7503e 100644
--- 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