kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Return `self` from `GroupChildSerializer#expand_hierarchy`

This commit is contained in:
Bob Van Landuyt 2017-10-10 16:01:42 +02:00
parent 9d1348d668
commit e55886b30e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/serializers/group_child_serializer.rb
View File

@ -6,10 +6,10 @@ class GroupChildSerializer < BaseSerializer
entity GroupChildEntity
def expand_hierarchy(hierarchy_root = nil)
tap do
@hierarchy_root = hierarchy_root
@should_expand_hierarchy = true
end
@hierarchy_root = hierarchy_root
@should_expand_hierarchy = true
self
end
def represent(resource, opts = {}, entity_class = nil)
@ -41,7 +41,7 @@ class GroupChildSerializer < BaseSerializer
.merge(children: Array.wrap(serializer.represent_hierarchy(children, opts)))
end
elsif hierarchy.is_a?(Array)
hierarchy.map { |child| serializer.represent_hierarchy(child, opts) }.flatten
hierarchy.flat_map { |child| serializer.represent_hierarchy(child, opts) }
else
serializer.represent(hierarchy, opts)
end