diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-01-29 06:45:10 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2018-01-29 06:48:14 +0900 |
| commit | 41d34ae68fc09474d88ed286890f4e73e815fb66 (patch) | |
| tree | 36d3f92b3289306c410ce45b83811fdc26a7c1ab /activerecord/lib/active_record | |
| parent | c9822ace4c8961336527670e7eef59093f515dfd (diff) | |
| download | rails-41d34ae68fc09474d88ed286890f4e73e815fb66.tar.gz rails-41d34ae68fc09474d88ed286890f4e73e815fb66.tar.bz2 rails-41d34ae68fc09474d88ed286890f4e73e815fb66.zip | |
Allow expanding an array of `composed_of` objects
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/sanitization.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/sanitization.rb b/activerecord/lib/active_record/sanitization.rb index 4acc491104..173794b8f4 100644 --- a/activerecord/lib/active_record/sanitization.rb +++ b/activerecord/lib/active_record/sanitization.rb @@ -155,12 +155,10 @@ module ActiveRecord if aggregation = reflect_on_aggregation(attr.to_sym) mapping = aggregation.mapping mapping.each do |field_attr, aggregate_attr| - expanded_attrs[field_attr] = if mapping.size == 1 && !value.respond_to?(aggregate_attr) - if value.is_a?(Array) - value.map { |it| it.respond_to?(aggregate_attr) ? it.send(aggregate_attr) : it } - else - value - end + expanded_attrs[field_attr] = if value.is_a?(Array) + value.map { |it| it.send(aggregate_attr) } + elsif mapping.size == 1 && !value.respond_to?(aggregate_attr) + value else value.send(aggregate_attr) end |