From: simonbrandhof <simon.brandhof@gmail.com>
Date: Wed, 12 Jan 2011 17:34:54 +0000 (+0100)
Subject: merge 2.5: SONAR-2101 Drilldown is sometimes empty when the parameter characteristic... 
X-Git-Tag: 2.6~166
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5a8ac313e2317c13b0da23ec76b10b40d479b46c;p=sonarqube.git

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

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