From 2eac1537ad907f2f7e628788cf980cb7e48d3f56 Mon Sep 17 00:00:00 2001 From: Bob Van Landuyt Date: Mon, 4 Sep 2017 20:01:58 +0200 Subject: Fetch children using new finder for the `show` of a group. --- app/controllers/groups_controller.rb | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'app/controllers/groups_controller.rb') diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 3769a2cde33..588995ab5a8 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -45,18 +45,15 @@ class GroupsController < Groups::ApplicationController end def show - setup_projects + @children = GroupChildrenFinder.new(current_user, parent_group: @group, params: params).execute + + @children = @children.page(params[:page]) respond_to do |format| format.html - format.json do - render json: { - html: view_to_html_string("dashboard/projects/_projects", locals: { projects: @projects }) - } - end - format.atom do + setup_projects load_events render layout: 'xml.atom' end -- cgit v1.2.3