From: simonbrandhof <simon.brandhof@gmail.com>
Date: Wed, 22 Dec 2010 15:29:24 +0000 (+0000)
Subject: SONAR-1722 change color of overrides icon + fix bulk change
X-Git-Tag: 2.6~242
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d7ad68b9d7ffe7b7f666ddb633bb6ee0043e7070;p=sonarqube.git

SONAR-1722 change color of overrides icon + fix bulk change
---

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/rules_configuration_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/rules_configuration_controller.rb
index a4df4d785a1..2688bb4b1c8 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/rules_configuration_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/rules_configuration_controller.rb
@@ -317,7 +317,7 @@ class RulesConfigurationController < ApplicationController
   def deactivate_rules(profile, rule_ids)
     count=0
     profile.active_rules.each do |ar|
-      if rule_ids.include?(ar.rule_id) && !ar.inherited
+      if rule_ids.include?(ar.rule_id) && !ar.inheritance.present?
         ar.destroy
         java_facade.ruleDeactivated(profile.id, ar.rule_id)
         count+=1
diff --git a/sonar-server/src/main/webapp/images/overrides.png b/sonar-server/src/main/webapp/images/overrides.png
index 35186694207..1c08bca5bf7 100644
Binary files a/sonar-server/src/main/webapp/images/overrides.png and b/sonar-server/src/main/webapp/images/overrides.png differ