Commit 920f00a2 authored by Simon Knox's avatar Simon Knox

fix deselect of users

parent 4ad907c4
...@@ -63,14 +63,9 @@ export default { ...@@ -63,14 +63,9 @@ export default {
}, },
}, },
watch: { watch: {
board: { selected() {
handler() { new UsersSelect();
this.$nextTick(() => { },
new UsersSelect();
});
},
deep: true,
}
}, },
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
......
...@@ -55,14 +55,14 @@ gl.issueBoards.BoardsStore = { ...@@ -55,14 +55,14 @@ gl.issueBoards.BoardsStore = {
this.state.currentPage = page; this.state.currentPage = page;
}, },
updateBoardConfig(board = {}) { updateBoardConfig(board = {}) {
this.boardConfig.id = board.id;
this.boardConfig.name = board.name; this.boardConfig.name = board.name;
this.boardConfig.milestone = board.milestone; this.boardConfig.milestone = board.milestone;
this.boardConfig.milestone_id = board.milestone_id; this.boardConfig.milestone_id = board.milestone_id;
this.boardConfig.id = board.id;
this.boardConfig.weight = board.weight; this.boardConfig.weight = board.weight;
this.boardConfig.labels = board.labels || []; this.boardConfig.labels = board.labels || [];
this.boardConfig.assignee_id = board.assignee_id; this.boardConfig.assignee_id = board.assignee_id;
Vue.set(this.boardConfig, 'assignee', board.assignee); this.boardConfig.assignee = board.assignee || {};
}, },
addList (listObj, defaultAvatar) { addList (listObj, defaultAvatar) {
const list = new List(listObj, defaultAvatar); const list = new List(listObj, defaultAvatar);
......
...@@ -443,8 +443,7 @@ function UsersSelect(currentUser, els) { ...@@ -443,8 +443,7 @@ function UsersSelect(currentUser, els) {
if ($el.closest('.add-issues-modal').length) { if ($el.closest('.add-issues-modal').length) {
gl.issueBoards.ModalStore.store.filter[$dropdown.data('field-name')] = user.id; gl.issueBoards.ModalStore.store.filter[$dropdown.data('field-name')] = user.id;
} else if ($el.closest('.js-board-config-modal').length) { } else if ($el.closest('.js-board-config-modal').length) {
gl.issueBoards.BoardsStore.boardConfig.assignee = user; gl.issueBoards.BoardsStore.boardConfig.assignee = isMarking ? user : {};
gl.issueBoards.BoardsStore.boardConfig.assignee_id = user.id;
} else if ($dropdown.hasClass('js-filter-submit') && (isIssueIndex || isMRIndex)) { } else if ($dropdown.hasClass('js-filter-submit') && (isIssueIndex || isMRIndex)) {
return Issuable.filterResults($dropdown.closest('form')); return Issuable.filterResults($dropdown.closest('form'));
} else if ($dropdown.hasClass('js-filter-submit')) { } else if ($dropdown.hasClass('js-filter-submit')) {
......
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