From 5a8ac313e2317c13b0da23ec76b10b40d479b46c Mon Sep 17 00:00:00 2001 From: simonbrandhof Date: Wed, 12 Jan 2011 18:34:54 +0100 Subject: merge 2.5: SONAR-2101 Drilldown is sometimes empty when the parameter characteristic is set --- .../src/main/webapp/WEB-INF/app/controllers/drilldown_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sonar-server') 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 -- cgit v1.2.3