Dont override project_id params when use issues/mr filtering

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

diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 770fcca..cb46b5b 100644 (file)
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -118,8 +118,7 @@ class Projects::IssuesController < Projects::ApplicationController
   def issues_filtered
     params[:scope] = 'all' if params[:scope].blank?
     params[:state] = 'opened' if params[:state].blank?
-    params[:project_id] = @project.id
-    @issues = FilteringService.new.execute(Issue, current_user, params)
+    @issues = FilteringService.new.execute(Issue, current_user, params.merge(project_id: @project.id))
   end
 
   # Since iids are implemented only in 6.1

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 40564c7..0792dbf 100644 (file)
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -20,9 +20,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     params[:sort] ||= 'newest'
     params[:scope] = 'all' if params[:scope].blank?
     params[:state] = 'opened' if params[:state].blank?
-    params[:project_id] = @project.id
 
-    @merge_requests = FilteringService.new.execute(MergeRequest, current_user, params)
+    @merge_requests = FilteringService.new.execute(MergeRequest, current_user, params.merge(project_id: @project.id))
     @merge_requests = @merge_requests.page(params[:page]).per(20)
 
     @sort = params[:sort].humanize