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
Jérome Perrin
gitlab-ce
Commits
34d11a31
Commit
34d11a31
authored
Jul 06, 2016
by
tiagonbotelho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
implements filter_params
parent
06c7d6f3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
0 deletions
+21
-0
lib/api/entities.rb
lib/api/entities.rb
+2
-0
lib/api/helpers.rb
lib/api/helpers.rb
+17
-0
lib/api/projects.rb
lib/api/projects.rb
+2
-0
No files found.
lib/api/entities.rb
View file @
34d11a31
...
@@ -331,7 +331,9 @@ module API
...
@@ -331,7 +331,9 @@ module API
class
ProjectWithAccess
<
Project
class
ProjectWithAccess
<
Project
expose
:permissions
do
expose
:permissions
do
expose
:project_access
,
using:
Entities
::
ProjectAccess
do
|
project
,
options
|
expose
:project_access
,
using:
Entities
::
ProjectAccess
do
|
project
,
options
|
project
=
Project
.
find_by
(
project
[
:id
])
project
.
project_members
.
find_by
(
user_id:
options
[
:user
].
id
)
project
.
project_members
.
find_by
(
user_id:
options
[
:user
].
id
)
]
end
end
expose
:group_access
,
using:
Entities
::
GroupAccess
do
|
project
,
options
|
expose
:group_access
,
using:
Entities
::
GroupAccess
do
|
project
,
options
|
...
...
lib/api/helpers.rb
View file @
34d11a31
...
@@ -287,6 +287,23 @@ module API
...
@@ -287,6 +287,23 @@ module API
# Projects helpers
# Projects helpers
def
filter_params
(
projects
)
project_entries
=
[]
# Removes the redundant information of the object
projects
.
each
do
|
project
|
entry
=
{
id:
project
.
id
,
http_url_to_repo:
project
.
http_url_to_repo
,
name_with_namespace:
project
.
name_with_namespace
}
project_entries
<<
entry
end
project_entries
end
def
filter_projects
(
projects
)
def
filter_projects
(
projects
)
# If the archived parameter is passed, limit results accordingly
# If the archived parameter is passed, limit results accordingly
if
params
[
:archived
].
present?
if
params
[
:archived
].
present?
...
...
lib/api/projects.rb
View file @
34d11a31
...
@@ -25,6 +25,8 @@ module API
...
@@ -25,6 +25,8 @@ module API
@projects
=
current_user
.
authorized_projects
@projects
=
current_user
.
authorized_projects
@projects
=
filter_projects
(
@projects
)
@projects
=
filter_projects
(
@projects
)
@projects
=
paginate
@projects
@projects
=
paginate
@projects
@projects
=
filter_params
(
@projects
)
puts
present
@projects
,
with:
Entities
::
ProjectWithAccess
,
user:
current_user
present
@projects
,
with:
Entities
::
ProjectWithAccess
,
user:
current_user
present
@projects
,
with:
Entities
::
ProjectWithAccess
,
user:
current_user
end
end
...
...
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