From 518216c0627cb6c4b3db62f10877b44d0e912ddb Mon Sep 17 00:00:00 2001 From: Bob Van Landuyt Date: Thu, 7 Sep 2017 19:08:56 +0200 Subject: Merge group hierarchies when parents are shared --- app/controllers/groups_controller.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'app/controllers/groups_controller.rb') diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 4f0d1f88e58..a714f2cc7b0 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -77,6 +77,7 @@ class GroupsController < Groups::ApplicationController render json: GroupChildSerializer .new(current_user: current_user) .with_pagination(request, response) + .hierarchy_base(parent, open_hierarchy: filter[:filter].present) .represent(@children) end end -- cgit v1.2.3