diff options
Diffstat (limited to 'app/views/shared/boards/_show.html.haml')
-rw-r--r-- | app/views/shared/boards/_show.html.haml | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/app/views/shared/boards/_show.html.haml b/app/views/shared/boards/_show.html.haml index 7a4c495e177..e5808bfe878 100644 --- a/app/views/shared/boards/_show.html.haml +++ b/app/views/shared/boards/_show.html.haml @@ -2,7 +2,6 @@ - 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 @@ -12,23 +11,18 @@ - content_for :page_specific_javascripts do - -# haml-lint:disable InlineJavaScript %script#js-board-modal-filter{ type: "text/x-template" }= render "shared/issuable/search_bar", type: :boards_modal, show_sorting_dropdown: false %script#js-board-promotion{ type: "text/x-template" }= render_if_exists "shared/promotions/promote_issue_board" #board-app.boards-app.position-relative{ "v-cloak" => "true", data: board_data, ":class" => "{ 'is-compact': detailIssueVisible }" } = render 'shared/issuable/search_bar', type: :boards, board: board - - if Feature.enabled?(:boards_with_swimlanes, current_board_parent) + - if Feature.enabled?(:boards_with_swimlanes, current_board_parent) || Feature.enabled?(:graphql_board_lists, current_board_parent) %board-content{ "v-cloak" => "true", "ref" => "board_content", ":lists" => "state.lists", ":can-admin-list" => can_admin_list, - ":group-id" => group_id, - ":disabled" => "disabled", - ":issue-link-base" => "issueLinkBase", - ":root-path" => "rootPath", - ":board-id" => "boardId" } + ":disabled" => "disabled" } - else .boards-list.w-100.py-3.px-2.text-nowrap{ data: { qa_selector: "boards_list" } } .boards-app-loading.w-100.text-center{ "v-if" => "loading" } @@ -37,12 +31,8 @@ "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", - ":root-path" => "rootPath", - ":board-id" => "boardId", ":key" => "list.id" } = render "shared/boards/components/sidebar", group: group = render_if_exists 'shared/boards/components/board_settings_sidebar' @@ -51,6 +41,4 @@ "milestone-path" => milestones_filter_dropdown_path, "label-path" => labels_filter_path_with_defaults, "empty-state-svg" => image_path('illustrations/issues.svg'), - ":issue-link-base" => "issueLinkBase", - ":root-path" => "rootPath", ":project-id" => @project.id } |