diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-08-14 04:10:19 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-08-14 04:10:19 -0700 |
| commit | b3641967b8f8a69edd1d1c7d801c0184d35c3af6 (patch) | |
| tree | 3f1da8b7e059a74ff5dd8aa7f6124ce4e03e7a08 /activemodel/lib | |
| parent | 89cc4f15014cd7d544f912331bed836c5e5c3f0a (diff) | |
| parent | 78f5874c82ed50d405cbe1ae9a9e75b7b2ae8ef5 (diff) | |
| download | rails-b3641967b8f8a69edd1d1c7d801c0184d35c3af6.tar.gz rails-b3641967b8f8a69edd1d1c7d801c0184d35c3af6.tar.bz2 rails-b3641967b8f8a69edd1d1c7d801c0184d35c3af6.zip | |
Merge pull request #7184 from anthonyalberto/xml_dasherize_include
to_xml dasherize option should be passed to included associations
Diffstat (limited to 'activemodel/lib')
| -rwxr-xr-x[-rw-r--r--] | activemodel/lib/active_model/serializers/xml.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activemodel/lib/active_model/serializers/xml.rb b/activemodel/lib/active_model/serializers/xml.rb index 016d821fdf..cf742d0569 100644..100755 --- a/activemodel/lib/active_model/serializers/xml.rb +++ b/activemodel/lib/active_model/serializers/xml.rb @@ -115,6 +115,10 @@ module ActiveModel merged_options = opts.merge(options.slice(:builder, :indent)) merged_options[:skip_instruct] = true + [:skip_types, :dasherize, :camelize].each do |key| + merged_options[key] = options[key] if merged_options[key].nil? && !options[key].nil? + end + if records.respond_to?(:to_ary) records = records.to_ary |