kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Use ProjectFinder to filter the projects

Browse source 
Instead of trying to do the heavy lifting in the API itself, use the existing
features of the ProjectFinder.
This commit is contained in:
Toon Claes 2017-05-23 22:40:39 +02:00
parent 0725050802
commit a1deed629e
2 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/api/helpers.rb
View file

@ -261,19 +261,6 @@ module API
projects = projects.merge(current_user.owned_projects) projects = projects.merge(current_user.owned_projects)
end end
if params[:starred]
projects = projects.merge(current_user.starred_projects)
end
if params[:search].present?
projects = projects.search(params[:search])
end
if params[:visibility].present?
projects = projects.search_by_visibility(params[:visibility])
end
projects = projects.where(archived: params[:archived])
projects.reorder(params[:order_by] => params[:sort]) projects.reorder(params[:order_by] => params[:sort])
end end

4
lib/api/projects.rb
View file

@ -70,6 +70,10 @@ module API
def present_projects(options = {}) def present_projects(options = {})
finder_params = {} finder_params = {}
finder_params[:non_public] = true if params[:membership].present? finder_params[:non_public] = true if params[:membership].present?
finder_params[:starred] = true if params[:starred].present?
finder_params[:visibility_level] = Gitlab::VisibilityLevel.level_value(params[:visibility]) if params[:visibility]
finder_params[:archived] = params[:archived]
finder_params[:search] = params[:search] if params[:search]
projects = ProjectsFinder.new(current_user: current_user, params: finder_params).execute projects = ProjectsFinder.new(current_user: current_user, params: finder_params).execute
projects = filter_projects(projects) projects = filter_projects(projects)