diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 18:08:11 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 18:08:11 +0000 |
| commit | 8a7efa45c38ed3200d173d2c3207a8154e583c16 (patch) | |
| tree | 1bb4d579b95c79aae4946a06fefa089e5549b722 /app/views | |
| parent | 53b1f4eaa2a451aaba908a5fee7ce97a930021ac (diff) | |
| download | gitlab-ce-8a7efa45c38ed3200d173d2c3207a8154e583c16.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/shared/boards/_show.html.haml | 6 | ||||
| -rw-r--r-- | app/views/shared/boards/components/_board.html.haml | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/app/views/shared/boards/_show.html.haml b/app/views/shared/boards/_show.html.haml index 7f62b983bfc..cf42ac3dd37 100644 --- a/app/views/shared/boards/_show.html.haml +++ b/app/views/shared/boards/_show.html.haml @@ -1,5 +1,9 @@ - board = local_assigns.fetch(:board, nil) - group = local_assigns.fetch(:group, false) +-# TODO: Move group_id and can_admin_list to the board store + See: https://gitlab.com/gitlab-org/gitlab/-/issues/213082 +- group_id = @group&.id || "null" +- can_admin_list = can?(current_user, :admin_list, current_board_parent) == true - @no_breadcrumb_container = true - @no_container = true - @content_class = "issue-boards-content js-focus-mode-board" @@ -22,6 +26,8 @@ %board{ "v-cloak" => "true", "v-for" => "list in state.lists", "ref" => "board", + ":can-admin-list" => can_admin_list, + ":group-id" => group_id, ":list" => "list", ":disabled" => "disabled", ":issue-link-base" => "issueLinkBase", diff --git a/app/views/shared/boards/components/_board.html.haml b/app/views/shared/boards/components/_board.html.haml index e42d8650708..f3f2c09ea61 100644 --- a/app/views/shared/boards/components/_board.html.haml +++ b/app/views/shared/boards/components/_board.html.haml @@ -1,3 +1,6 @@ +-# Please have a look at app/assets/javascripts/boards/components/board_column.vue + This haml file is deprecated and will be deleted soon, please change the Vue app + https://gitlab.com/gitlab-org/gitlab/-/issues/212300 .board.h-100.px-2.align-top.ws-normal{ ":class" => '{ "is-draggable": !list.preset, "is-expandable": list.isExpandable, "is-collapsed": !list.isExpanded, "board-type-assignee": list.type === "assignee" }', ":data-id" => "list.id", data: { qa_selector: "board_list" } } .board-inner.d-flex.flex-column.position-relative.h-100.rounded |