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

Make it possible to combine :trending with other params

Browse source 
Now it is possible to combine the :non_public parameter. This might be useful
when a user wants to know the trending projects they are member of.
This commit is contained in:
Toon Claes 2017-05-26 15:39:38 +02:00
parent 0f0b9a8466
commit 5654ac877d
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/finders/projects_finder.rb
View file

@ -32,6 +32,7 @@ class ProjectsFinder < UnionFinder
item = by_ids(item)
item = by_personal(item)
item = by_starred(item)
item = by_trending(item)
item = by_visibilty_level(item)
item = by_tags(item)
item = by_search(item)
@ -46,12 +47,8 @@ class ProjectsFinder < UnionFinder
def init_collection
projects = []
if params[:trending].present?
projects << Project.trending
else
projects << current_user.authorized_projects if current_user
projects << Project.unscoped.public_to_user(current_user) unless params[:non_public].present?
end
projects << current_user.authorized_projects if current_user
projects << Project.unscoped.public_to_user(current_user) unless params[:non_public].present?
projects
end
@ -72,6 +69,10 @@ class ProjectsFinder < UnionFinder
(params[:starred].present? && current_user) ? items.starred_by(current_user) : items
end
def by_trending(items)
params[:trending].present? ? items.trending : items
end
def by_visibilty_level(items)
params[:visibility_level].present? ? items.where(visibility_level: params[:visibility_level]) : items
end