aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Lancelot <julien.lancelot@gmail.com>2013-08-13 11:51:03 +0200
committerJulien Lancelot <julien.lancelot@gmail.com>2013-08-13 11:51:15 +0200
commitf857f5589f3bf8503ae3d8f000ae59c52a66f5fd (patch)
tree58675159c57269cb7b8dbf7b5e7b26c473bd943e
parent6c5a78202a340093aa44df95e8ceaa5daa59760d (diff)
downloadsonarqube-f857f5589f3bf8503ae3d8f000ae59c52a66f5fd.tar.gz
sonarqube-f857f5589f3bf8503ae3d8f000ae59c52a66f5fd.zip
SONAR-4554 Kicked out of Issues filter when applying bulk change on a filter
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/controllers/issues_controller.rb10
1 files changed, 7 insertions, 3 deletions
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