Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
52ea9097
Commit
52ea9097
authored
Sep 15, 2020
by
manojmj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor relation_group_members method
This change refactors the `relation_group_members ` method
parent
0533f830
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
12 deletions
+10
-12
app/finders/group_members_finder.rb
app/finders/group_members_finder.rb
+6
-2
ee/app/finders/ee/group_members_finder.rb
ee/app/finders/ee/group_members_finder.rb
+3
-9
ee/spec/finders/ee/group_members_finder_spec.rb
ee/spec/finders/ee/group_members_finder_spec.rb
+1
-1
No files found.
app/finders/group_members_finder.rb
View file @
52ea9097
...
...
@@ -66,9 +66,13 @@ class GroupMembersFinder < UnionFinder
group
.
members
end
# rubocop: disable CodeReuse/ActiveRecord
def
relation_group_members
(
relation
)
GroupMember
.
non_request
.
non_minimal_access
all_group_members
(
relation
).
non_minimal_access
end
# rubocop: disable CodeReuse/ActiveRecord
def
all_group_members
(
relation
)
GroupMember
.
non_request
.
where
(
source_id:
relation
.
select
(
:id
))
.
where
.
not
(
user_id:
group
.
users
.
select
(
:id
))
end
...
...
ee/app/finders/ee/group_members_finder.rb
View file @
52ea9097
...
...
@@ -18,19 +18,13 @@ module EE::GroupMembersFinder
def
group_members_list
return
group
.
all_group_members
if
group
.
minimal_access_role_allowed?
group
.
members
super
end
override
:relation_group_members
# rubocop: disable CodeReuse/ActiveRecord
def
relation_group_members
(
relation
)
members
=
::
GroupMember
.
non_request
.
where
(
source_id:
relation
.
select
(
:id
))
.
where
.
not
(
user_id:
group
.
users
.
select
(
:id
))
return
members
if
group
.
minimal_access_role_allowed?
return
all_group_members
(
relation
)
if
group
.
minimal_access_role_allowed?
members
.
non_minimal_access
super
end
# rubocop: enable CodeReuse/ActiveRecord
end
ee/spec/finders/ee/group_members_finder_spec.rb
View file @
52ea9097
...
...
@@ -43,7 +43,7 @@ RSpec.describe GroupMembersFinder do
stub_licensed_features
(
minimal_access_role:
true
)
end
it
'
returns only
members with minimal access'
do
it
'
also returns
members with minimal access'
do
result
=
finder
.
execute
(
include_relations:
[
:direct
,
:descendants
])
expect
(
result
.
to_a
).
to
match_array
([
group_owner_membership
,
group_member_membership
,
dedicated_member_account_membership
,
group_minimal_access_membership
])
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment