mirror of
https://gitlab.com/gitlab-org/gitlab-foss.git
synced 2025-08-20 14:11:11 +00:00
Refactor FilterContext
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
@ -51,30 +51,12 @@ class DashboardController < ApplicationController
|
||||
end
|
||||
|
||||
def merge_requests
|
||||
@merge_requests = case params[:scope]
|
||||
when 'authored' then
|
||||
current_user.merge_requests
|
||||
when 'all' then
|
||||
MergeRequest.where(target_project_id: current_user.authorized_projects.pluck(:id))
|
||||
else
|
||||
current_user.assigned_merge_requests
|
||||
end
|
||||
|
||||
@merge_requests = FilterContext.new(@merge_requests, params).execute
|
||||
@merge_requests = FilterContext.new(MergeRequest, current_user, params).execute
|
||||
@merge_requests = @merge_requests.recent.page(params[:page]).per(20)
|
||||
end
|
||||
|
||||
def issues
|
||||
@issues = case params[:scope]
|
||||
when 'authored' then
|
||||
current_user.issues
|
||||
when 'all' then
|
||||
Issue.where(project_id: current_user.authorized_projects.pluck(:id))
|
||||
else
|
||||
current_user.assigned_issues
|
||||
end
|
||||
|
||||
@issues = FilterContext.new(@issues, params).execute
|
||||
@issues = FilterContext.new(Issue, current_user, params).execute
|
||||
@issues = @issues.recent.page(params[:page]).per(20)
|
||||
@issues = @issues.includes(:author, :project)
|
||||
|
||||
|
Reference in New Issue
Block a user