diff options
author | Rémy Coutable <remy@rymai.me> | 2017-04-06 10:22:04 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-04-06 10:22:04 +0000 |
commit | 32db15b24b8c69e39451f4afb951c993f9fbf31e (patch) | |
tree | 76e0f408dbbebe52e95824b1aa1e030b3a819fdb /app/controllers/dashboard | |
parent | d7e3f2322fd0ad632687f2f27a1cf2aac5474ac9 (diff) | |
parent | b996a82ff44e3bcad5e5fb70cabbfa808d06cf62 (diff) | |
download | gitlab-ce-32db15b24b8c69e39451f4afb951c993f9fbf31e.tar.gz |
Merge branch '28810-projectfinder-should-handle-more-options' into 'master'
ProjectsFinder should handle more options
Closes #28810
See merge request !9682
Diffstat (limited to 'app/controllers/dashboard')
-rw-r--r-- | app/controllers/dashboard/projects_controller.rb | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb index be00d765f73..5a1efcab1a3 100644 --- a/app/controllers/dashboard/projects_controller.rb +++ b/app/controllers/dashboard/projects_controller.rb @@ -1,10 +1,11 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController - include FilterProjects + include ParamsBackwardCompatibility + + before_action :set_non_archived_param + before_action :default_sorting def index - @projects = load_projects(current_user.authorized_projects) - @projects = @projects.sort(@sort = params[:sort]) - @projects = @projects.page(params[:page]) + @projects = load_projects(params.merge(non_public: true)).page(params[:page]) respond_to do |format| format.html { @last_push = current_user.recent_push } @@ -21,10 +22,8 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController end def starred - @projects = load_projects(current_user.viewable_starred_projects) - @projects = @projects.includes(:forked_from_project, :tags) - @projects = @projects.sort(@sort = params[:sort]) - @projects = @projects.page(params[:page]) + @projects = load_projects(params.merge(starred: true)). + includes(:forked_from_project, :tags).page(params[:page]) @last_push = current_user.recent_push @groups = [] @@ -41,14 +40,18 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController private - def load_projects(base_scope) - projects = base_scope.sorted_by_activity.includes(:route, namespace: :route) + def default_sorting + params[:sort] ||= 'latest_activity_desc' + @sort = params[:sort] + end - filter_projects(projects) + def load_projects(finder_params) + ProjectsFinder.new(params: finder_params, current_user: current_user). + execute.includes(:route, namespace: :route) end def load_events - @events = Event.in_projects(load_projects(current_user.authorized_projects)) + @events = Event.in_projects(load_projects(params.merge(non_public: true))) @events = event_filter.apply_filter(@events).with_associations @events = @events.limit(20).offset(params[:offset] || 0) end |