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
d089f4b2
Commit
d089f4b2
authored
Oct 01, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
clean up props for assignee select
parent
4906b385
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
35 additions
and
15 deletions
+35
-15
app/assets/javascripts/boards/components/assignee_select.vue
app/assets/javascripts/boards/components/assignee_select.vue
+22
-7
app/assets/javascripts/boards/components/board_form.vue
app/assets/javascripts/boards/components/board_form.vue
+7
-5
app/assets/javascripts/boards/components/milestone_select.vue
...assets/javascripts/boards/components/milestone_select.vue
+1
-1
app/assets/javascripts/boards/components/weight_select.vue
app/assets/javascripts/boards/components/weight_select.vue
+1
-1
app/assets/javascripts/boards/services/board_service.js
app/assets/javascripts/boards/services/board_service.js
+4
-1
No files found.
app/assets/javascripts/boards/components/assignee_select.vue
View file @
d089f4b2
...
...
@@ -12,22 +12,22 @@
</div>
<div
class=
"value"
>
<div
v-if=
"
board.assignee.nam
e"
v-if=
"
hasValu
e"
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
();
},
...
...
app/assets/javascripts/boards/components/board_form.vue
View file @
d089f4b2
...
...
@@ -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"
:fieldN
ame=
"'board_filter[weight]'"
:can
E
dit=
"canAdminBoard"
field-n
ame=
"'board_filter[weight]'"
:can
-e
dit=
"canAdminBoard"
>
<board-weight-select
:board=
"board"
v-model=
"board.weight"
title=
"Weight"
defaultText=
"Any weight"
:can
E
dit=
"canAdminBoard"
:can
-e
dit=
"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
()
{
...
...
app/assets/javascripts/boards/components/milestone_select.vue
View file @
d089f4b2
<
template
>
<div
class=
"dropdown"
:class=
"
{ open: isOpen }">
<div
class=
"dropdown
milestone
"
:class=
"
{ open: isOpen }">
<div
class=
"title append-bottom-10"
>
{{
title
}}
<a
...
...
app/assets/javascripts/boards/components/weight_select.vue
View file @
d089f4b2
<
template
>
<div
class=
"dropdown"
:class=
"
{ open: isOpen }">
<div
class=
"dropdown
weight
"
:class=
"
{ open: isOpen }">
<div
class=
"title append-bottom-10"
>
{{
title
}}
<a
...
...
app/assets/javascripts/boards/services/board_service.js
View file @
d089f4b2
...
...
@@ -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
);
...
...
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