Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
920f00a2
Commit
920f00a2
authored
Oct 06, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix deselect of users
parent
4ad907c4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
12 deletions
+6
-12
app/assets/javascripts/boards/components/user_select.vue
app/assets/javascripts/boards/components/user_select.vue
+3
-8
app/assets/javascripts/boards/stores/boards_store.js
app/assets/javascripts/boards/stores/boards_store.js
+2
-2
app/assets/javascripts/users_select.js
app/assets/javascripts/users_select.js
+1
-2
No files found.
app/assets/javascripts/boards/components/user_select.vue
View file @
920f00a2
...
...
@@ -63,14 +63,9 @@ export default {
},
},
watch
:
{
board
:
{
handler
()
{
this
.
$nextTick
(()
=>
{
new
UsersSelect
();
});
},
deep
:
true
,
}
selected
()
{
new
UsersSelect
();
},
},
mounted
()
{
this
.
$nextTick
(()
=>
{
...
...
app/assets/javascripts/boards/stores/boards_store.js
View file @
920f00a2
...
...
@@ -55,14 +55,14 @@ gl.issueBoards.BoardsStore = {
this
.
state
.
currentPage
=
page
;
},
updateBoardConfig
(
board
=
{})
{
this
.
boardConfig
.
id
=
board
.
id
;
this
.
boardConfig
.
name
=
board
.
name
;
this
.
boardConfig
.
milestone
=
board
.
milestone
;
this
.
boardConfig
.
milestone_id
=
board
.
milestone_id
;
this
.
boardConfig
.
id
=
board
.
id
;
this
.
boardConfig
.
weight
=
board
.
weight
;
this
.
boardConfig
.
labels
=
board
.
labels
||
[];
this
.
boardConfig
.
assignee_id
=
board
.
assignee_id
;
Vue
.
set
(
this
.
boardConfig
,
'
assignee
'
,
board
.
assignee
)
;
this
.
boardConfig
.
assignee
=
board
.
assignee
||
{}
;
},
addList
(
listObj
,
defaultAvatar
)
{
const
list
=
new
List
(
listObj
,
defaultAvatar
);
...
...
app/assets/javascripts/users_select.js
View file @
920f00a2
...
...
@@ -443,8 +443,7 @@ function UsersSelect(currentUser, els) {
if
(
$el
.
closest
(
'
.add-issues-modal
'
).
length
)
{
gl
.
issueBoards
.
ModalStore
.
store
.
filter
[
$dropdown
.
data
(
'
field-name
'
)]
=
user
.
id
;
}
else
if
(
$el
.
closest
(
'
.js-board-config-modal
'
).
length
)
{
gl
.
issueBoards
.
BoardsStore
.
boardConfig
.
assignee
=
user
;
gl
.
issueBoards
.
BoardsStore
.
boardConfig
.
assignee_id
=
user
.
id
;
gl
.
issueBoards
.
BoardsStore
.
boardConfig
.
assignee
=
isMarking
?
user
:
{};
}
else
if
(
$dropdown
.
hasClass
(
'
js-filter-submit
'
)
&&
(
isIssueIndex
||
isMRIndex
))
{
return
Issuable
.
filterResults
(
$dropdown
.
closest
(
'
form
'
));
}
else
if
(
$dropdown
.
hasClass
(
'
js-filter-submit
'
))
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment