diff options
| author | Fabrice Bellingard <bellingard@gmail.com> | 2012-01-19 11:25:16 +0100 |
|---|---|---|
| committer | Fabrice Bellingard <bellingard@gmail.com> | 2012-01-19 11:25:56 +0100 |
| commit | 928d87dc0b04c556efbcc64526790c93cc19bace (patch) | |
| tree | ca8b46b9900bf79385c54b06e4a324ac2741cae0 | |
| parent | 0fec00abc09830a0f256df3c48e5b5826eb2c9ea (diff) | |
| download | sonarqube-928d87dc0b04c556efbcc64526790c93cc19bace.tar.gz sonarqube-928d87dc0b04c556efbcc64526790c93cc19bace.zip | |
SONAR-3012 Fix regression on the filter of the violations viewer
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb | 2 | ||||
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/views/resource/_rules_filter.html.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb index 4a6b7673eec..1d359f4f76b 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb @@ -331,7 +331,7 @@ class ResourceController < ApplicationController conditions='snapshot_id=?' values=[@snapshot.id] - if params[:rule].blank? + if params[:rule].blank? || params[:rule] == "all" conditions+=' AND (switched_off IS NULL OR switched_off=?)' values<<false else diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_rules_filter.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_rules_filter.html.erb index 3354f90e6d5..16d48b93d07 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_rules_filter.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_rules_filter.html.erb @@ -44,7 +44,7 @@ <select id="rule" name="rule" onchange="applyOptions()"> - <option value=""><%= message('all_violations') -%></option> + <option value="all"><%= message('all_violations') -%></option> <optgroup label="<%= message('reviews') -%>"> |