SONAR-1856 Filters must exclude measures on quality model characteristics

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/filter_result.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/filter_result.rb
index 7ca93ed54e3526a404c0c9ef400c2c541280e81a..0f8f9be97876a6c1607e84896a9234cac60c5c85 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/filter_result.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/filter_result.rb
@@ -50,7 +50,7 @@
         # load measures
         #
         if @metric_ids.size>0
-          measures=ProjectMeasure.find(:all, :conditions => ['rule_priority is null and rules_category_id is null and rule_id is null and snapshot_id in (?)', @page_sids])
+          measures=ProjectMeasure.find(:all, :conditions => ['rule_priority is null and rules_category_id is null and rule_id is null and characteristic_id is null and snapshot_id in (?)', @page_sids])
 
           if filter.display_user_managed_metrics?
             measures.concat(AsyncMeasureSnapshot.search(@page_sids, @metric_ids))