diff options
| author | simonbrandhof <simon.brandhof@gmail.com> | 2011-01-12 18:34:54 +0100 |
|---|---|---|
| committer | simonbrandhof <simon.brandhof@gmail.com> | 2011-01-12 18:34:54 +0100 |
| commit | 5a8ac313e2317c13b0da23ec76b10b40d479b46c (patch) | |
| tree | 98e2e39cbbba3d1396ce5ce601d9a25a953deb75 /sonar-server | |
| parent | a0aec0767a37cdafdf70b2f90fe438d53da43a26 (diff) | |
| download | sonarqube-5a8ac313e2317c13b0da23ec76b10b40d479b46c.tar.gz sonarqube-5a8ac313e2317c13b0da23ec76b10b40d479b46c.zip | |
merge 2.5: SONAR-2101 Drilldown is sometimes empty when the parameter characteristic is set
Diffstat (limited to 'sonar-server')
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/controllers/drilldown_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/drilldown_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/drilldown_controller.rb index 636f55c531e..7f1e27281b6 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/drilldown_controller.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/drilldown_controller.rb @@ -45,7 +45,7 @@ class DrilldownController < ApplicationController if params[:characteristic_id] @characteristic=Characteristic.find(params[:characteristic_id]) elsif params[:model] && params[:characteristic] - @characteristic=Characteristic.find(:first, :select => 'id', :include => 'quality_model', :conditions => ['quality_models.name=? AND characteristics.kee=?', params[:model], params[:characteristic]]) + @characteristic=Characteristic.find(:first, :select => 'id', :include => 'quality_model', :conditions => ['quality_models.name=? AND characteristics.kee=? AND characteristics.enabled=?', params[:model], params[:characteristic], true]) end options[:characteristic]=@characteristic |