diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-07 20:48:57 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-07 20:52:43 +0200 |
commit | cc64f2a814802abe9ae3bb8297079b643c8774df (patch) | |
tree | 5eb20bceb48b9f81093e8734907fe4c9f7b40ada /app/controllers/dashboard_controller.rb | |
parent | 0a1603992490d47b3fe676a02dedb5417603a1f2 (diff) | |
download | gitlab-ce-cc64f2a814802abe9ae3bb8297079b643c8774df.tar.gz |
Common filtering for dashboard and group. Share partial search result partial
Diffstat (limited to 'app/controllers/dashboard_controller.rb')
-rw-r--r-- | app/controllers/dashboard_controller.rb | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 695e8cb88c1..4bd840a07fb 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -36,14 +36,14 @@ class DashboardController < ApplicationController # Get authored or assigned open merge requests def merge_requests @merge_requests = current_user.cared_merge_requests - @merge_requests = dashboard_filter(@merge_requests) + @merge_requests = FilterContext.new(@merge_requests, params).execute @merge_requests = @merge_requests.recent.page(params[:page]).per(20) end # Get only assigned issues def issues @issues = current_user.assigned_issues - @issues = dashboard_filter(@issues) + @issues = FilterContext.new(@issues, params).execute @issues = @issues.recent.page(params[:page]).per(20) @issues = @issues.includes(:author, :project) @@ -62,23 +62,4 @@ class DashboardController < ApplicationController def event_filter @event_filter ||= EventFilter.new(params[:event_filter]) end - - def dashboard_filter items - if params[:project_id] - items = items.where(project_id: params[:project_id]) - end - - if params[:search].present? - items = items.search(params[:search]) - end - - case params[:status] - when 'closed' - items.closed - when 'all' - items - else - items.opened - end - end end |