BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
07fc79e7
Commit
07fc79e7
authored
May 23, 2017
by
Toon Claes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle `membership` in ProjectFinder
The ProjectFinder supports the `non_public` parameter. This can be used to find only projects the user is member of.
parent
4fda13b6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
helpers.rb
lib/api/helpers.rb
+0
-4
projects.rb
lib/api/projects.rb
+4
-1
No files found.
lib/api/helpers.rb
View file @
07fc79e7
...
@@ -257,10 +257,6 @@ module API
...
@@ -257,10 +257,6 @@ module API
# project helpers
# project helpers
def
filter_projects
(
projects
)
def
filter_projects
(
projects
)
if
params
[
:membership
]
projects
=
projects
.
merge
(
current_user
.
authorized_projects
)
end
if
params
[
:owned
]
if
params
[
:owned
]
projects
=
projects
.
merge
(
current_user
.
owned_projects
)
projects
=
projects
.
merge
(
current_user
.
owned_projects
)
end
end
...
...
lib/api/projects.rb
View file @
07fc79e7
...
@@ -68,7 +68,10 @@ module API
...
@@ -68,7 +68,10 @@ module API
end
end
def
present_projects
(
options
=
{})
def
present_projects
(
options
=
{})
projects
=
ProjectsFinder
.
new
(
current_user:
current_user
).
execute
finder_params
=
{}
finder_params
[
:non_public
]
=
true
if
params
[
:membership
].
present?
projects
=
ProjectsFinder
.
new
(
current_user:
current_user
,
params:
finder_params
).
execute
projects
=
filter_projects
(
projects
)
projects
=
filter_projects
(
projects
)
projects
=
projects
.
with_statistics
if
params
[
:statistics
]
projects
=
projects
.
with_statistics
if
params
[
:statistics
]
projects
=
projects
.
with_issues_enabled
if
params
[
:with_issues_enabled
]
projects
=
projects
.
with_issues_enabled
if
params
[
:with_issues_enabled
]
...
...
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