diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-28 13:40:13 +0300 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2017-06-29 20:35:29 +0300 |
commit | fe26e095bae6ca444c60bdedaccf4bfce63b0c03 (patch) | |
tree | feb6b8eb6afda6fc93e5204411331d771041def2 /app | |
parent | debc61264d05fcd7f152b1251d5a3fbeb44d9bfa (diff) |
Merge branch 'issue-boards-closed-list-all' into 'master'
Fixed issue boards closed list not listing all issues
Closes #33850
See merge request !12271
Diffstat (limited to 'app')
-rw-r--r-- | app/services/boards/issues/list_service.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/app/services/boards/issues/list_service.rb b/app/services/boards/issues/list_service.rb index 418fa9afd6e..a1d67cbc244 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 @@ -21,7 +21,15 @@ module Boards end def movable_list? - @movable_list ||= list.present? && list.movable? + return @movable_list if defined?(@movable_list) + + @movable_list = list.present? && list.movable? + end + + def closed_list? + return @closed_list if defined?(@closed_list) + + @closed_list = list.present? && list.closed? end def filter_params |