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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
67c4f07d
Commit
67c4f07d
authored
Apr 10, 2019
by
Constance Okoghenun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backported changes from EE for board list model
parent
9d7ff90d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
3 deletions
+16
-3
app/assets/javascripts/boards/models/list.js
app/assets/javascripts/boards/models/list.js
+16
-3
No files found.
app/assets/javascripts/boards/models/list.js
View file @
67c4f07d
...
...
@@ -4,8 +4,9 @@
import
{
__
}
from
'
~/locale
'
;
import
ListLabel
from
'
~/vue_shared/models/label
'
;
import
ListAssignee
from
'
~/vue_shared/models/assignee
'
;
import
{
urlParamsToObject
}
from
'
~/lib/utils/common_utils
'
;
import
{
isEE
,
urlParamsToObject
}
from
'
~/lib/utils/common_utils
'
;
import
boardsStore
from
'
../stores/boards_store
'
;
import
ListMilestone
from
'
./milestone
'
;
const
PER_PAGE
=
20
;
...
...
@@ -51,6 +52,9 @@ class List {
}
else
if
(
obj
.
user
)
{
this
.
assignee
=
new
ListAssignee
(
obj
.
user
);
this
.
title
=
this
.
assignee
.
name
;
}
else
if
(
isEE
&&
obj
.
milestone
)
{
this
.
milestone
=
new
ListMilestone
(
obj
.
milestone
);
this
.
title
=
this
.
milestone
.
title
;
}
if
(
!
typeInfo
.
isBlank
&&
this
.
id
)
{
...
...
@@ -69,12 +73,14 @@ class List {
}
save
()
{
const
entity
=
this
.
label
||
this
.
assignee
;
const
entity
=
this
.
label
||
this
.
assignee
||
this
.
milestone
;
let
entityType
=
''
;
if
(
this
.
label
)
{
entityType
=
'
label_id
'
;
}
else
{
}
else
if
(
this
.
assignee
)
{
entityType
=
'
assignee_id
'
;
}
else
if
(
isEE
&&
this
.
milestone
)
{
entityType
=
'
milestone_id
'
;
}
return
gl
.
boardService
...
...
@@ -192,6 +198,13 @@ class List {
issue
.
addAssignee
(
this
.
assignee
);
}
if
(
isEE
&&
this
.
milestone
)
{
if
(
listFrom
&&
listFrom
.
type
===
'
milestone
'
)
{
issue
.
removeMilestone
(
listFrom
.
milestone
);
}
issue
.
addMilestone
(
this
.
milestone
);
}
if
(
listFrom
)
{
this
.
issuesSize
+=
1
;
...
...
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