From: Fabrice Bellingard <bellingard@gmail.com>
Date: Thu, 9 Feb 2012 10:02:47 +0000 (+0100)
Subject: SONAR-2124 Fix display bug
X-Git-Tag: 2.14~125
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e0b45cc17db9d5d17a8c98b6558656fa55466391;p=sonarqube.git

SONAR-2124 Fix display bug
---

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