From 0725050802dd30d4c235b6a2d28dd494d2d7429b Mon Sep 17 00:00:00 2001 From: Toon Claes Date: Tue, 23 May 2017 22:38:12 +0200 Subject: Change ProjectFinder so starred can be combined with other filters The `starred` parameter couldn't be used in combination with `trending` or `non_public`. But this is changed now. --- app/finders/projects_finder.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'app/finders/projects_finder.rb') diff --git a/app/finders/projects_finder.rb b/app/finders/projects_finder.rb index f6d8226bf3f..588406982d7 100644 --- a/app/finders/projects_finder.rb +++ b/app/finders/projects_finder.rb @@ -31,6 +31,7 @@ class ProjectsFinder < UnionFinder items = by_ids(items) items = union(items) items = by_personal(items) + items = by_starred(items) items = by_visibilty_level(items) items = by_tags(items) items = by_search(items) @@ -45,8 +46,6 @@ class ProjectsFinder < UnionFinder if params[:trending].present? projects << Project.trending - elsif params[:starred].present? && current_user - projects << current_user.viewable_starred_projects else projects << current_user.authorized_projects if current_user projects << Project.unscoped.public_to_user(current_user) unless params[:non_public].present? @@ -67,6 +66,10 @@ class ProjectsFinder < UnionFinder (params[:personal].present? && current_user) ? items.personal(current_user) : items end + def by_starred(items) + (params[:starred].present? && current_user) ? items.starred_by(current_user) : items + end + def by_visibilty_level(items) params[:visibility_level].present? ? items.where(visibility_level: params[:visibility_level]) : items end -- cgit v1.2.3