summaryrefslogtreecommitdiffstats
path: root/sonar-server
diff options
context:
space:
mode:
authorFabrice Bellingard <bellingard@gmail.com>2012-02-09 11:02:47 +0100
committerFabrice Bellingard <bellingard@gmail.com>2012-02-09 11:02:47 +0100
commite0b45cc17db9d5d17a8c98b6558656fa55466391 (patch)
treead8de8f48c1fbfb03f3ba51218ff9f40cf2d7a82 /sonar-server
parenta249b40770d9431308e2f04bad6e43f8331eaa1b (diff)
downloadsonarqube-e0b45cc17db9d5d17a8c98b6558656fa55466391.tar.gz
sonarqube-e0b45cc17db9d5d17a8c98b6558656fa55466391.zip
SONAR-2124 Fix display bug
Diffstat (limited to 'sonar-server')
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule_param.html.erb8
1 files changed, 4 insertions, 4 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule_param.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule_param.html.erb
index ce6f11f42f4..806e15df641 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule_param.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule_param.html.erb
@@ -37,13 +37,13 @@
<%
if active_rule && active_rule.overrides? && ancestor_active_rule
ancestor_param = ancestor_active_rule.active_param_by_param_id(parameter.id)
- ancestor_value = ancestor_param && ancestor_param.value ? ancestor_param.value : '(' + message('rules_configuration.parent_parameter.empty') + ')'
+ ancestor_value = ancestor_param && ancestor_param.value ? ancestor_param.value : ''
- if ancestor_value && ancestor_value != param_value
- %>
+ if ancestor_value != param_value
+ %>
<img src="<%= ApplicationController.root_context -%>/images/overrides.png" alt="Overrides parent definition" title="<%= message('rules_configuration.overrides_parent_definition') -%>" style="vertical-align: middle"/>
<span class="form-val-note" style="font-weight: bold; vertical-align: middle;">
- <%= message('rules_configuration.original_value') -%>: <%= ancestor_value -%>
+ <%= message('rules_configuration.original_value') -%>: <%= ancestor_value.blank? ? '(' + message('rules_configuration.parent_parameter.empty') + ')' : ancestor_value -%>
</span>
<%
end