From f857f5589f3bf8503ae3d8f000ae59c52a66f5fd Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Tue, 13 Aug 2013 11:51:03 +0200 Subject: SONAR-4554 Kicked out of Issues filter when applying bulk change on a filter --- .../main/webapp/WEB-INF/app/controllers/issues_controller.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'sonar-server') 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 -- cgit v1.2.3