diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-12 21:09:23 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-12 21:09:23 +0300 |
commit | ee4105895ebffdc6185d20f4592031723a76fedc (patch) | |
tree | 2c723287e54f4131ccb95ad0e8b1e0609311621b /app/helpers | |
parent | 006000e366ad5dc61966770d33e3afd4c07e728d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/boards_helper.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/helpers/boards_helper.rb b/app/helpers/boards_helper.rb index 73e7476b55d..b8c2255ab7e 100644 --- a/app/helpers/boards_helper.rb +++ b/app/helpers/boards_helper.rb @@ -18,7 +18,7 @@ module BoardsHelper time_tracking_limit_to_hours: Gitlab::CurrentSettings.time_tracking_limit_to_hours.to_s, recent_boards_endpoint: recent_boards_path, parent: current_board_parent.model_name.param_key, - group_id: @group&.id, + group_id: group_id, labels_filter_base_path: build_issue_link_base, labels_fetch_path: labels_fetch_path, labels_manage_path: labels_manage_path, @@ -26,6 +26,12 @@ module BoardsHelper } end + def group_id + return @group.id if board.group_board? + + @project&.group&.id + end + def full_path if board.group_board? @group.full_path |