SONAR-3838 The widget "Most violated resources" generates an exception when used on a "Developer" resource

1 files changed, 2 insertions, 1 deletions

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/hotspots/hotspot_most_violated_resources.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/hotspots/hotspot_most_violated_resources.html.erb
index c3cde4869f1..c377a0cdd9c 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/hotspots/hotspot_most_violated_resources.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/hotspots/hotspot_most_violated_resources.html.erb
@@ -9,7 +9,7 @@
    snapshots_values[:root_sid] = (@snapshot.root_snapshot_id || @snapshot.id)
    snapshots_values[:path]="#{@snapshot.path}#{@snapshot.id}.%"
 
-   measures_conditions = ["project_measures.rule_id IS NULL", "project_measures.characteristic_id IS NULL", "project_measures.person_id IS NULL"]
+   measures_conditions = ["project_measures.rule_id IS NULL AND project_measures.characteristic_id IS NULL AND project_measures.person_id IS NULL"]
    measures_values = {}
    measures_conditions << "project_measures.metric_id = :m_id"
    measures_values[:m_id] = metric.id
@@ -19,6 +19,7 @@
                                 :conditions => [(snapshots_conditions + measures_conditions).join(' AND '), snapshots_values.merge(measures_values)],
                                 :order => "project_measures.value #{'DESC' if metric.direction<0}",
                                 :limit => limit)
+   measures=measures.select{|m| m.text_value.present?}
 
    snapshots=Snapshot.find(measures.map { |m| m.snapshot_id }, :include => 'project')
    snapshots_by_id = {}