diff options
| author | Felipe Artur <felipefac@gmail.com> | 2018-04-05 00:43:33 +0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2018-04-05 20:58:49 +0300 |
| commit | 22423d284704c3ec2f7715736a75155d14ff413d (patch) | |
| tree | af4f3c9ec4e2e486af3c7d292d54d07ccc2ff741 /app/services | |
| parent | 6b3585d8ea15a7ee1a5cd2f5799caace48ab0c32 (diff) | |
Show issues of subgroups in group-level issue board
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/boards/issues/list_service.rb | 5 | ||||
| -rw-r--r-- | app/services/issuable_base_service.rb | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/services/boards/issues/list_service.rb b/app/services/boards/issues/list_service.rb index ecd74b74f8a..8a1796a1096 100644 --- a/app/services/boards/issues/list_service.rb +++ b/app/services/boards/issues/list_service.rb @@ -35,6 +35,7 @@ module Boards def filter_params set_parent set_state + set_scope params end @@ -51,6 +52,10 @@ module Boards params[:state] = list && list.closed? ? 'closed' : 'opened' end + def set_scope + params[:include_subgroups] = true if board.group_board? + end + def board_label_ids @board_label_ids ||= board.lists.movable.pluck(:label_id) end diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb index 91ec702fbc6..1f67e3ecf9d 100644 --- a/app/services/issuable_base_service.rb +++ b/app/services/issuable_base_service.rb @@ -51,9 +51,10 @@ class IssuableBaseService < BaseService return unless milestone_id params[:milestone_id] = '' if milestone_id == IssuableFinder::NONE + group_ids = project.group&.self_and_ancestors&.pluck(:id) milestone = - Milestone.for_projects_and_groups([project.id], [project.group&.id]).find_by_id(milestone_id) + Milestone.for_projects_and_groups([project.id], group_ids).find_by_id(milestone_id) params[:milestone_id] = '' unless milestone end |