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 a4df4d785a15ad64781de1faeb2a62fa1bdcaebf..2688bb4b1c89cc4c07d4de32c0c053edf51d2efa 100644 (file)
--- 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)\r
     count=0\r
     profile.active_rules.each do |ar|\r
-      if rule_ids.include?(ar.rule_id) && !ar.inherited\r
+      if rule_ids.include?(ar.rule_id) && !ar.inheritance.present?\r
         ar.destroy\r
         java_facade.ruleDeactivated(profile.id, ar.rule_id)\r
         count+=1\r

diff --git a/sonar-server/src/main/webapp/images/overrides.png b/sonar-server/src/main/webapp/images/overrides.png
index 35186694207a1445c9b026cfb708761f5c858666..1c08bca5bf7f7f409f1b11b3898d070d8f4815ba 100644 (file)
Binary files a/sonar-server/src/main/webapp/images/overrides.png and b/sonar-server/src/main/webapp/images/overrides.png differ