diff options
| author | simonbrandhof <simon.brandhof@gmail.com> | 2010-12-22 15:29:24 +0000 |
|---|---|---|
| committer | simonbrandhof <simon.brandhof@gmail.com> | 2010-12-22 15:29:24 +0000 |
| commit | d7ad68b9d7ffe7b7f666ddb633bb6ee0043e7070 (patch) | |
| tree | e3b1f6c7cdc44f53df499012ce774b00161525f0 /sonar-server/src/main | |
| parent | 0c585e0f026f659792939b4c5b82aa506b5a7cba (diff) | |
| download | sonarqube-d7ad68b9d7ffe7b7f666ddb633bb6ee0043e7070.tar.gz sonarqube-d7ad68b9d7ffe7b7f666ddb633bb6ee0043e7070.zip | |
SONAR-1722 change color of overrides icon + fix bulk change
Diffstat (limited to 'sonar-server/src/main')
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/controllers/rules_configuration_controller.rb | 2 | ||||
| -rw-r--r-- | sonar-server/src/main/webapp/images/overrides.png | bin | 520 -> 586 bytes |
2 files changed, 1 insertions, 1 deletions
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 Binary files differindex 35186694207..1c08bca5bf7 100644 --- a/sonar-server/src/main/webapp/images/overrides.png +++ b/sonar-server/src/main/webapp/images/overrides.png |
