diff options
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb index cc0dffd3b7f..843c6b0904f 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb @@ -61,9 +61,12 @@ <%= render "settings/error", :key => property.key -%> - <% default_prop_value = (@resource ? Property.value(property.key, nil, property.defaultValue) : property.defaultValue) -%> - <% unless default_prop_value.blank? -%> - <div class="note"><%= message('default') %>: <%= property.type.to_s=='PASSWORD' ? '********' : h(default_prop_value) -%></div> + <!-- SONAR-4707 Don't display default value for property sets --> + <% if property.fields.blank? %> + <% default_prop_value = (@resource ? Property.value(property.key, nil, property.defaultValue) : property.defaultValue) -%> + <% unless default_prop_value.blank? -%> + <div class="note"><%= message('default') %>: <%= property.type.to_s=='PASSWORD' ? '********' : h(default_prop_value) -%></div> + <% end -%> <% end -%> <% desc=property_description(property) -%> |