merge 2.5: SONAR-2101 Drilldown is sometimes empty when the parameter characteristic...

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 636f55c531ea049a1dd7c53ab67269da26ae71a9..7f1e27281b64d9afeff6851abffdd31fca2dfb7c 100644 (file)
--- 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