diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-09-19 12:15:57 +0300 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-10-04 23:49:41 +0300 |
| commit | 31f775689396722e38de20157b46a75b1fe40582 (patch) | |
| tree | a91dfc0f12c5ac8b844094957519b131967d33f2 /app | |
| parent | e3daa73fbfce6f178de512aeb165072f1ffde503 (diff) | |
`current_user:` as a keyword argument
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/groups_controller.rb | 4 | ||||
| -rw-r--r-- | app/finders/group_children_finder.rb | 2 | ||||
| -rw-r--r-- | app/serializers/group_child_entity.rb | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index d35364ffe1e..1cec83a3bc6 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -118,7 +118,9 @@ class GroupsController < Groups::ApplicationController protected def setup_children(parent) - @children = GroupChildrenFinder.new(current_user, parent_group: parent, params: params).execute + @children = GroupChildrenFinder.new(current_user: current_user, + parent_group: parent, + params: params).execute @children = @children.page(params[:page]) end diff --git a/app/finders/group_children_finder.rb b/app/finders/group_children_finder.rb index 430373a92a2..93a218ee5b3 100644 --- a/app/finders/group_children_finder.rb +++ b/app/finders/group_children_finder.rb @@ -3,7 +3,7 @@ class GroupChildrenFinder attr_reader :current_user, :parent_group, :params - def initialize(current_user = nil, parent_group:, params: {}) + def initialize(current_user: nil, parent_group:, params: {}) @current_user = current_user @parent_group = parent_group @params = params diff --git a/app/serializers/group_child_entity.rb b/app/serializers/group_child_entity.rb index 35f5a020793..6c795da8f88 100644 --- a/app/serializers/group_child_entity.rb +++ b/app/serializers/group_child_entity.rb @@ -55,7 +55,8 @@ class GroupChildEntity < Grape::Entity unless: lambda { |_instance, _options| project? } def children_finder - @children_finder ||= GroupChildrenFinder.new(request.current_user, parent_group: object) + @children_finder ||= GroupChildrenFinder.new(current_user: request.current_user, + parent_group: object) end def children_count |