SONAR-3897 Filter disable rules in "Compare Profiles"

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb
index ca6f1f3f32531fbbf6ab79a06b83b0ffa51596bb..1dc5ab7d8a1bd6664528b561a906e6d5971b4d0e 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb
@@ -335,6 +335,9 @@ class ProfilesController < ApplicationController
       arules2 = ActiveRule.find(:all, :order => 'rules.plugin_name, rules.plugin_rule_key', :include => [{:active_rule_parameters => :rules_parameter}, :rule],
                                 :conditions => ['active_rules.profile_id=?', @profile2.id])
 
+      arules1.reject! { |arule| !arule.rule.enabled }
+      arules2.reject! { |arule| !arule.rule.enabled }
+
       diffs_by_rule={}
       arules1.each do |arule1|
         diffs_by_rule[arule1.rule]||=RuleDiff.new(arule1.rule)