Merge branch '24215-closed-issues-board' into 'master'
Display all closed issues in “done” board list Closes #24215 See merge request !10173
This commit is contained in:
commit
4eed34811c
3 changed files with 7 additions and 2 deletions
|
@ -3,7 +3,7 @@ module Boards
|
|||
class ListService < BaseService
|
||||
def execute
|
||||
issues = IssuesFinder.new(current_user, filter_params).execute
|
||||
issues = without_board_labels(issues) unless movable_list?
|
||||
issues = without_board_labels(issues) unless list
|
||||
issues = with_list_label(issues) if movable_list?
|
||||
issues.order_by_position_and_priority
|
||||
end
|
||||
|
|
4
changelogs/unreleased/24215-closed-issues-board.yml
Normal file
4
changelogs/unreleased/24215-closed-issues-board.yml
Normal file
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Display all closed issues in “done” board list
|
||||
merge_request:
|
||||
author:
|
|
@ -30,6 +30,7 @@ describe Boards::Issues::ListService, services: true do
|
|||
let!(:closed_issue2) { create(:labeled_issue, :closed, project: project, labels: [p3]) }
|
||||
let!(:closed_issue3) { create(:issue, :closed, project: project) }
|
||||
let!(:closed_issue4) { create(:labeled_issue, :closed, project: project, labels: [p1]) }
|
||||
let!(:closed_issue5) { create(:labeled_issue, :closed, project: project, labels: [development]) }
|
||||
|
||||
before do
|
||||
project.team << [user, :developer]
|
||||
|
@ -57,7 +58,7 @@ describe Boards::Issues::ListService, services: true do
|
|||
|
||||
issues = described_class.new(project, user, params).execute
|
||||
|
||||
expect(issues).to eq [closed_issue4, closed_issue2, closed_issue3, closed_issue1]
|
||||
expect(issues).to eq [closed_issue4, closed_issue2, closed_issue5, closed_issue3, closed_issue1]
|
||||
end
|
||||
|
||||
it 'returns opened issues that have label list applied when listing issues from a label list' do
|
||||
|
|
Loading…
Reference in a new issue