diff options
| author | David Gageot <david@gageot.net> | 2012-10-08 18:16:21 +0200 |
|---|---|---|
| committer | David Gageot <david@gageot.net> | 2012-10-08 18:16:30 +0200 |
| commit | e4527d2d9dc22be58fa135be5a30fdf0eae57fc6 (patch) | |
| tree | 97a36dfdacab1c18dec401aaa5cb7a266de43da3 /sonar-server | |
| parent | e5a3859ff7b6b17013cd9b123f9086f7e91539b5 (diff) | |
| download | sonarqube-e4527d2d9dc22be58fa135be5a30fdf0eae57fc6.tar.gz sonarqube-e4527d2d9dc22be58fa135be5a30fdf0eae57fc6.zip | |
SONAR-3529 Fix for property sets
Diffstat (limited to 'sonar-server')
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/helpers/settings_helper.rb | 4 | ||||
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/models/property.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/settings_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/settings_helper.rb index 1b7c36b12e8..1ddd6320627 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/settings_helper.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/settings_helper.rb @@ -57,7 +57,7 @@ module SettingsHelper end def property_value(property) - if property.multi_values + if property.multi_values? Property.values(property.key, @resource ? @resource.id : nil) else Property.value(property.key, @resource ? @resource.id : nil, '') @@ -87,7 +87,7 @@ module SettingsHelper def input_name(property) name = "settings[#{h property.key}]" - if property.multi_values + if property.multi_values? name += '[]' end name diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/property.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/property.rb index ddcb556c65f..cff720bfc3f 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/models/property.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/models/property.rb @@ -126,7 +126,7 @@ class Property < ActiveRecord::Base end def multi_values? - (java_definition && (java_definition.multi_values || !java_definition.fields.blank?)) || (java_field_definition && java_field_definition.multi_values) + java_definition && (java_definition.isMultiValues() || !java_definition.fields.blank?) end def to_xml(xml=Builder::XmlMarkup.new(:indent => 0)) |