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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
d74ad926
Commit
d74ad926
authored
Dec 08, 2016
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use a single query in Projects::ProjectMembersController to fetch members
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
10d4b20a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
6 deletions
+5
-6
app/controllers/projects/project_members_controller.rb
app/controllers/projects/project_members_controller.rb
+5
-6
No files found.
app/controllers/projects/project_members_controller.rb
View file @
d74ad926
...
@@ -35,13 +35,12 @@ class Projects::ProjectMembersController < Projects::ApplicationController
...
@@ -35,13 +35,12 @@ class Projects::ProjectMembersController < Projects::ApplicationController
@group_links
=
@project
.
project_group_links
.
where
(
group_id:
@project
.
invited_groups
.
search
(
params
[
:search
]).
select
(
:id
))
@group_links
=
@project
.
project_group_links
.
where
(
group_id:
@project
.
invited_groups
.
search
(
params
[
:search
]).
select
(
:id
))
end
end
member_ids
=
@project_members
.
pluck
(
:id
)
wheres
=
[
"id IN (
#{
@project_members
.
select
(
:id
).
to_sql
}
)"
]
wheres
<<
"id IN (
#{
group_members
.
select
(
:id
).
to_sql
}
)"
if
group_members
if
group_members
@project_members
=
Member
.
member_ids
+=
group_members
.
pluck
(
:id
)
where
(
wheres
.
join
(
' OR '
)).
end
order
(
access_level: :desc
).
page
(
params
[
:page
])
@project_members
=
Member
.
where
(
id:
member_ids
).
order
(
access_level: :desc
).
page
(
params
[
:page
])
@requesters
=
AccessRequestsFinder
.
new
(
@project
).
execute
(
current_user
)
@requesters
=
AccessRequestsFinder
.
new
(
@project
).
execute
(
current_user
)
...
...
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