diff options
Diffstat (limited to 'app/views/shared/boards/components')
-rw-r--r-- | app/views/shared/boards/components/_sidebar.html.haml | 2 | ||||
-rw-r--r-- | app/views/shared/boards/components/sidebar/_assignee.html.haml | 36 |
2 files changed, 8 insertions, 30 deletions
diff --git a/app/views/shared/boards/components/_sidebar.html.haml b/app/views/shared/boards/components/_sidebar.html.haml index b4f75967a67..3daa13fb488 100644 --- a/app/views/shared/boards/components/_sidebar.html.haml +++ b/app/views/shared/boards/components/_sidebar.html.haml @@ -1,6 +1,6 @@ %board-sidebar{ "inline-template" => true, ":current-user" => (UserSerializer.new.represent(current_user) || {}).to_json } %transition{ name: "boards-sidebar-slide" } - %aside.right-sidebar.right-sidebar-expanded.issue-boards-sidebar{ "v-show" => "showSidebar" } + %aside.right-sidebar.right-sidebar-expanded.issue-boards-sidebar{ "v-show" => "showSidebar", 'aria-label': s_('Boards|Board') } .issuable-sidebar .block.issuable-sidebar-header.position-relative %span.issuable-header-text.hide-collapsed.float-left diff --git a/app/views/shared/boards/components/sidebar/_assignee.html.haml b/app/views/shared/boards/components/sidebar/_assignee.html.haml index e22a7807b3b..c36f2c7c969 100644 --- a/app/views/shared/boards/components/sidebar/_assignee.html.haml +++ b/app/views/shared/boards/components/sidebar/_assignee.html.haml @@ -1,31 +1,9 @@ +- dropdown_options = assignees_dropdown_options('issue') + .block.assignee{ ref: "assigneeBlock" } %template{ "v-if" => "issue.assignees" } - %assignee-title{ ":number-of-assignees" => "issue.assignees.length", - ":loading" => "loadingAssignees", - ":editable" => can_admin_issue? } - %assignees.value{ "root-path" => "#{root_url}", - ":users" => "issue.assignees", - ":editable" => can_admin_issue?, - "@assign-self" => "assignSelf" } - - - if can_admin_issue? - .selectbox.hide-collapsed - %input.js-vue{ type: "hidden", - name: "issue[assignee_ids][]", - ":value" => "assignee.id", - "v-if" => "issue.assignees", - "v-for" => "assignee in issue.assignees", - ":data-avatar_url" => "assignee.avatar", - ":data-name" => "assignee.name", - ":data-username" => "assignee.username" } - .dropdown - - dropdown_options = assignees_dropdown_options('issue') - %button.dropdown-menu-toggle.js-user-search.js-author-search.js-multiselect.js-save-user-data.js-issue-board-sidebar{ type: 'button', ref: 'assigneeDropdown', data: board_sidebar_user_data, - ":data-issuable-id" => "issue.iid" } - = dropdown_options[:title] - = sprite_icon('chevron-down', css_class: "dropdown-menu-toggle-icon gl-top-3") - .dropdown-menu.dropdown-select.dropdown-menu-user.dropdown-menu-selectable.dropdown-menu-author - = dropdown_title("Assign to") - = dropdown_filter("Search users") - = dropdown_content - = dropdown_loading + %sidebar-assignees-widget{ ":iid" => "String(issue.iid)", + ":full-path" => "issue.path.split('/-/')[0].substring(1)", + ":initial-assignees" => "issue.assignees", + ":multiple-assignees" => "!Boolean(#{dropdown_options[:data][:"max-select"]})", + "@assignees-updated" => "setAssignees" } |