Download as
Browse Code »

Commit e583df544308ff321ce92c79612ff950a4093e79

Authored by Dmitriy Zaporozhets
1 parent 74187621
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Dont override project_id params when use issues/mr filtering 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 2 changed files with 2 additions and 4 deletions   Show diff stats
app/controllers/projects/issues_controller.rb
  Diff comments   View file @e583df5
... ... @@ -118,8 +118,7 @@ class Projects::IssuesController &lt; Projects::ApplicationController
118 118 def issues_filtered
119 119 params[:scope] = 'all' if params[:scope].blank?
120 120 params[:state] = 'opened' if params[:state].blank?
121   - params[:project_id] = @project.id
122   - @issues = FilteringService.new.execute(Issue, current_user, params)
  121 + @issues = FilteringService.new.execute(Issue, current_user, params.merge(project_id: @project.id))
123 122 end
124 123  
125 124 # Since iids are implemented only in 6.1
... ...
app/controllers/projects/merge_requests_controller.rb
  Diff comments   View file @e583df5
... ... @@ -20,9 +20,8 @@ class Projects::MergeRequestsController &lt; Projects::ApplicationController
20 20 params[:sort] ||= 'newest'
21 21 params[:scope] = 'all' if params[:scope].blank?
22 22 params[:state] = 'opened' if params[:state].blank?
23   - params[:project_id] = @project.id
24 23  
25   - @merge_requests = FilteringService.new.execute(MergeRequest, current_user, params)
  24 + @merge_requests = FilteringService.new.execute(MergeRequest, current_user, params.merge(project_id: @project.id))
26 25 @merge_requests = @merge_requests.page(params[:page]).per(20)
27 26  
28 27 @sort = params[:sort].humanize
... ...