VladPolskiy/gitlab-foss
1
0
Fork 0
mirror of https://gitlab.com/gitlab-org/gitlab-foss.git synced 2025-08-20 14:11:11 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Consistently use current_user in API entities

Browse Source
This commit is contained in:
Markus Koller
2016-11-29 20:21:39 +01:00
parent d05dd81b99
commit d5c4977912
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/api/projects.rb
View File

@ -75,7 +75,7 @@ module API
projects = filter_projects(projects)
entity = params[:simple] || !current_user ? Entities::BasicProjectDetails : Entities::ProjectWithAccess
present paginate(projects), with: entity, user: current_user
present paginate(projects), with: entity, current_user: current_user
end
desc 'Get a projects list for authenticated user' do
@ -94,7 +94,7 @@ module API
projects = filter_projects(projects)
entity = params[:simple] ? Entities::BasicProjectDetails : Entities::ProjectWithAccess
present paginate(projects), with: entity, user: current_user
present paginate(projects), with: entity, current_user: current_user
end
desc 'Get an owned projects list for authenticated user' do
@ -110,7 +110,7 @@ module API
projects = current_user.owned_projects
projects = filter_projects(projects)
present paginate(projects), with: Entities::ProjectWithAccess, user: current_user
present paginate(projects), with: Entities::ProjectWithAccess, current_user: current_user
end
desc 'Gets starred project for the authenticated user' do
@ -126,7 +126,7 @@ module API
projects = current_user.viewable_starred_projects
projects = filter_projects(projects)
present paginate(projects), with: Entities::Project, user: current_user
present paginate(projects), with: Entities::Project, current_user: current_user
end
desc 'Get all projects for admin user' do
@ -142,7 +142,7 @@ module API
projects = Project.all
projects = filter_projects(projects)
present paginate(projects), with: Entities::ProjectWithAccess, user: current_user
present paginate(projects), with: Entities::ProjectWithAccess, current_user: current_user
end
desc 'Search for projects the current user has access to' do
@ -221,7 +221,7 @@ module API
end
get ":id" do
entity = current_user ? Entities::ProjectWithAccess : Entities::BasicProjectDetails
present user_project, with: entity, user: current_user,
present user_project, with: entity, current_user: current_user,
user_can_admin_project: can?(current_user, :admin_project, user_project)
end