mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Include empty has_many/has_and_belongs_to_many associations as empty array tags when serializing to XML
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7169 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
1241615692
commit
049b1440a3
2 changed files with 12 additions and 7 deletions
|
@ -205,13 +205,10 @@ module ActiveRecord #:nodoc:
|
||||||
case @record.class.reflect_on_association(association).macro
|
case @record.class.reflect_on_association(association).macro
|
||||||
when :has_many, :has_and_belongs_to_many
|
when :has_many, :has_and_belongs_to_many
|
||||||
records = @record.send(association).to_a
|
records = @record.send(association).to_a
|
||||||
unless records.empty?
|
tag = association.to_s
|
||||||
tag = association.to_s
|
tag = tag.dasherize if dasherize?
|
||||||
tag = tag.dasherize if dasherize?
|
builder.tag!(tag, :type => :array) do
|
||||||
|
records.each { |r| r.to_xml(opts.merge(:root=>r.class.to_s.underscore)) }
|
||||||
builder.tag!(tag, :type => :array) do
|
|
||||||
records.each { |r| r.to_xml(opts.merge(:root=>r.class.to_s.underscore)) }
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
when :has_one, :belongs_to
|
when :has_one, :belongs_to
|
||||||
if record = @record.send(association)
|
if record = @record.send(association)
|
||||||
|
|
|
@ -162,4 +162,12 @@ class DatabaseConnectedXmlSerializationTest < Test::Unit::TestCase
|
||||||
assert_match %r{^ <label>.*</label>}, xml
|
assert_match %r{^ <label>.*</label>}, xml
|
||||||
assert_no_match %r{^ <label>}, xml
|
assert_no_match %r{^ <label>}, xml
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_should_include_empty_has_many_as_empty_array
|
||||||
|
authors(:david).posts.delete_all
|
||||||
|
xml = authors(:david).to_xml :include=>:posts, :indent => 0
|
||||||
|
|
||||||
|
assert_match %r{<posts type="array"></posts>}, xml
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
Loading…
Reference in a new issue