Refactor issues and merge requests lists

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

1 files changed, 4 insertions, 14 deletions

diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 36222758eb2..a28f4cc4072 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -11,8 +11,6 @@ class GroupsController < ApplicationController
   # Load group projects
   before_filter :load_projects, except: [:new, :create, :projects, :edit, :update]
 
-  before_filter :default_filter, only: [:issues, :merge_requests]
-
   layout :determine_layout
 
   before_filter :set_title, only: [:new, :create]
@@ -47,13 +45,17 @@ class GroupsController < ApplicationController
   end
 
   def merge_requests
+    set_filters_defaults
     @merge_requests = MergeRequestsFinder.new.execute(current_user, params)
+    set_filter_values(@merge_requests)
     @merge_requests = @merge_requests.page(params[:page]).per(20)
     @merge_requests = @merge_requests.preload(:author, :target_project)
   end
 
   def issues
+    set_filters_defaults
     @issues = IssuesFinder.new.execute(current_user, params)
+    set_filter_values(@issues)
     @issues = @issues.page(params[:page]).per(20)
     @issues = @issues.preload(:author, :project)
 
@@ -148,18 +150,6 @@ class GroupsController < ApplicationController
     end
   end
 
-  def default_filter
-    if params[:scope].blank?
-      if current_user
-        params[:scope] = 'assigned-to-me'
-      else
-        params[:scope] = 'all'
-      end
-    end
-    params[:state] = 'opened' if params[:state].blank?
-    params[:group_id] = @group.id
-  end
-
   def group_params
     params.require(:group).permit(:name, :description, :path, :avatar)
   end