From ee2744c60db2e7d8a7e35fbc62c6d236c5ba2d0a Mon Sep 17 00:00:00 2001 From: Bob Van Landuyt Date: Fri, 22 Sep 2017 15:34:22 +0200 Subject: Don't wrap arrays twice: `children` are already wrapped in an array We do the wrapping in an array in represent_hierarchy for children. --- app/serializers/group_child_serializer.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/serializers/group_child_serializer.rb') diff --git a/app/serializers/group_child_serializer.rb b/app/serializers/group_child_serializer.rb index 1b6b2ad6e08..f2ec741d32c 100644 --- a/app/serializers/group_child_serializer.rb +++ b/app/serializers/group_child_serializer.rb @@ -27,8 +27,8 @@ class GroupChildSerializer < BaseSerializer if children.is_a?(GroupDescendant) represent_hierarchy(children.hierarchy(hierarchy_root), opts).first else - hierarchies = Array.wrap(GroupDescendant.merge_hierarchies(children, hierarchy_root)) - hierarchies.map { |hierarchy| represent_hierarchy(hierarchy, opts) }.flatten + hierarchies = GroupDescendant.merge_hierarchies(children, hierarchy_root) + represent_hierarchy(hierarchies, opts) end end -- cgit v1.2.3