Commit d089f4b2 authored by Simon Knox's avatar Simon Knox

clean up props for assignee select

parent 4906b385
......@@ -12,22 +12,22 @@
</div>
<div class="value">
<div
v-if="board.assignee.name"
v-if="hasValue"
class="media"
>
<div class="align-center">
<user-avatar-image
:img-src="board.assignee.avatar_url"
:size="40"
:img-src="selected.avatar_url"
:size="32"
/>
</div>
<div class="media-body">
<div class="bold author">
{{ board.assignee.name }}
{{ selected.name }}
</div>
<div class="username">
@{{ board.assignee.username }}
@{{ selected.username }}
</div>
</div>
</div>
......@@ -43,12 +43,13 @@
<div class="dropdown">
<button
class="dropdown-menu-toggle wide js-user-search js-author-search js-save-user-data js-board-config-modal"
data-field-name="assignee_id"
:data-field-name="fieldName"
data-current-user="true"
data-dropdown-title="Select assignee"
data-any-user="Any assignee"
:data-group-id="groupId"
:data-project-id="projectId"
:data-selected="1"
:data-selected="selected.id"
data-toggle="dropdown"
aria-expanded="false"
type="button"
......@@ -94,6 +95,10 @@ export default {
required: false,
default: false,
},
fieldName: {
type: String,
required: true,
},
groupId: {
type: String,
required: false,
......@@ -104,10 +109,20 @@ export default {
required: false,
default: '',
},
selected: {
type: Object,
required: false,
default: () => ({}),
}
},
components: {
UserAvatarImage,
},
computed: {
hasValue() {
return Object.keys(this.selected).length > 0 && this.selected.id;
},
},
mounted() {
new UsersSelect();
},
......
......@@ -83,7 +83,9 @@
<form-block>
<assignee-select
:board="board"
:canEdit="canAdminBoard"
field-name="assignee_id"
:selected="board.assignee"
:can-edit="canAdminBoard"
:project-id="projectId"
:group-id="groupId"
/>
......@@ -92,15 +94,15 @@
<form-block
title="Weight"
defaultText="Any weight"
:fieldName="'board_filter[weight]'"
:canEdit="canAdminBoard"
field-name="'board_filter[weight]'"
:can-edit="canAdminBoard"
>
<board-weight-select
:board="board"
v-model="board.weight"
title="Weight"
defaultText="Any weight"
:canEdit="canAdminBoard"
:can-edit="canAdminBoard"
/>
</form-block>
</div>
......@@ -271,7 +273,7 @@ export default Vue.extend({
}
})
.catch(() => {
// https://gitlab.com/gitlab-org/gitlab-ce/issues/30821
Flash('Unable to save your changes. Please try again.')
});
},
cancel() {
......
<template>
<div class="dropdown" :class="{ open: isOpen }">
<div class="dropdown milestone" :class="{ open: isOpen }">
<div class="title append-bottom-10">
{{ title }}
<a
......
<template>
<div class="dropdown" :class="{ open: isOpen }">
<div class="dropdown weight" :class="{ open: isOpen }">
<div class="title append-bottom-10">
{{ title }}
<a
......
......@@ -31,7 +31,10 @@ class BoardService {
createBoard (board) {
if (board.labels && board.labels.length > 0) {
board.label_ids = board.labels.map(b => b.id).join(',');
board.label_ids = board.labels.map(b => b.id);
}
if (board.assignee) {
board.assignee_id = board.assignee.id;
}
if (board.id) {
return this.boards.update({ id: board.id }, board);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment