diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-19 15:56:22 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-06-20 08:51:28 +0100 |
| commit | f343f00119f806d436037daaa1967fdce18c7c65 (patch) | |
| tree | e2f99b941b1afec7c1fa6d9d88247a6225d27533 | |
| parent | 5214e507b043c8e71d2826252491cdac97d27416 (diff) | |
| download | gitlab-ce-issue-boards-closed-list-all.tar.gz | |
Fixed issue boards closed list not listing all issuesissue-boards-closed-list-all
This was a regression caused by the backlog list being re-added
Closes #33850
| -rw-r--r-- | app/services/boards/issues/list_service.rb | 6 | ||||
| -rw-r--r-- | spec/services/boards/issues/list_service_spec.rb | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/services/boards/issues/list_service.rb b/app/services/boards/issues/list_service.rb index 418fa9afd6e..63145783fb5 100644 --- a/app/services/boards/issues/list_service.rb +++ b/app/services/boards/issues/list_service.rb @@ -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 movable_list? || closed_list? issues = with_list_label(issues) if movable_list? issues.order_by_position_and_priority end @@ -24,6 +24,10 @@ module Boards @movable_list ||= list.present? && list.movable? end + def closed_list? + @closed_list ||= list.present? && list.closed? + end + def filter_params set_default_scope set_project diff --git a/spec/services/boards/issues/list_service_spec.rb b/spec/services/boards/issues/list_service_spec.rb index a1e220c2322..a66cc2cd6e9 100644 --- a/spec/services/boards/issues/list_service_spec.rb +++ b/spec/services/boards/issues/list_service_spec.rb @@ -67,7 +67,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 |