Merge remote-tracking branch 'upstream/pull/5366'

[rails.git] / app / views / api / relations / index.json.jbuilder

diff --git a/app/views/api/relations/index.json.jbuilder b/app/views/api/relations/index.json.jbuilder
index 25c54fc6ff389ca00477da9b9ab07dc40951245d..9b0f65bf1eb0fb09e20dee4c8102b6cd9c0da897 100644 (file)
--- a/app/views/api/relations/index.json.jbuilder
+++ b/app/views/api/relations/index.json.jbuilder
@@ -1,5 +1,5 @@
-json.partial! "api/map/root_attributes"
+json.partial! "api/root_attributes"
 
-json.elements(@relations) do |relation|
-  json.partial! relation
+json.elements do
+  json.array! @relations, :partial => "relation", :as => :relation
 end