Fix issue when displaying rule parameter on not active rules

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/new_rules_configuration/_rule_param.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/new_rules_configuration/_rule_param.html.erb
index 0fa93e21b1221989046bc3c6455a5b15883258b4..d7f639afd9519a12a45ddbbe70e225011c5a9977 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/new_rules_configuration/_rule_param.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/new_rules_configuration/_rule_param.html.erb
@@ -1,6 +1,9 @@
 <% # locals = rule, profile, parameter
+   # Display default value only for inactive rules
    param_id = "#{rule.id}#{parameter.key}"
-   param_value = parameter.value || ''
+   # Display default value only for inactive rules
+   param_value = parameter.default_value if !rule.activeRuleId
+   param_value = parameter.value if !param_value
    active_rule_id = rule.activeRuleId
    read_only = rule.activeRuleId.nil? || !profiles_administrator?
 %>

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 a44e972bf74fc303eeb9ab5d6b1477f53744d6f1..bd034cc8a24203ce5045ae3478d88b307b76a2c1 100644 (file)
--- 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
@@ -1,5 +1,7 @@
 <%
-   param_value = active_parameter.value if active_parameter
+   # Display default value only for inactive rules
+   param_value = parameter.default_value if !active_rule
+   param_value = active_parameter.value if !param_value && active_parameter
    active_param_id = active_parameter.id if active_parameter
    active_rule_id = active_rule.id if active_rule
    read_only = !active_rule || !profiles_administrator?