From e3daa73fbfce6f178de512aeb165072f1ffde503 Mon Sep 17 00:00:00 2001 From: Bob Van Landuyt Date: Tue, 19 Sep 2017 11:05:31 +0200 Subject: Setup children in a a method and reuse for both calls --- app/controllers/groups_controller.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'app/controllers/groups_controller.rb') diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 575d5476867..d35364ffe1e 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -45,8 +45,7 @@ class GroupsController < Groups::ApplicationController end def show - @children = GroupChildrenFinder.new(current_user, parent_group: @group, params: params).execute - @children = @children.page(params[:page]) + setup_children(@group) respond_to do |format| format.html @@ -69,8 +68,7 @@ class GroupsController < Groups::ApplicationController render_404 end - @children = GroupChildrenFinder.new(current_user, parent_group: parent, params: params).execute - @children = @children.page(params[:page]) + setup_children(parent) respond_to do |format| format.json do @@ -119,6 +117,11 @@ class GroupsController < Groups::ApplicationController protected + def setup_children(parent) + @children = GroupChildrenFinder.new(current_user, parent_group: parent, params: params).execute + @children = @children.page(params[:page]) + end + def setup_projects set_non_archived_param params[:sort] ||= 'latest_activity_desc' -- cgit v1.2.3