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
7ad76a54
Commit
7ad76a54
authored
Jan 16, 2019
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle tasklist update failed in app component
parent
b72f52f1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
app/assets/javascripts/issue_show/components/app.vue
app/assets/javascripts/issue_show/components/app.vue
+9
-0
app/assets/javascripts/issue_show/components/description.vue
app/assets/javascripts/issue_show/components/description.vue
+4
-2
No files found.
app/assets/javascripts/issue_show/components/app.vue
View file @
7ad76a54
...
@@ -213,6 +213,14 @@ export default {
...
@@ -213,6 +213,14 @@ export default {
return
undefined
;
return
undefined
;
},
},
updateStoreState
()
{
this
.
service
.
getData
()
.
then
(
res
=>
res
.
data
)
.
then
(
data
=>
{
this
.
store
.
updateState
(
data
);
});
},
openForm
()
{
openForm
()
{
if
(
!
this
.
showForm
)
{
if
(
!
this
.
showForm
)
{
this
.
showForm
=
true
;
this
.
showForm
=
true
;
...
@@ -327,6 +335,7 @@ export default {
...
@@ -327,6 +335,7 @@ export default {
:issuable-type=
"issuableType"
:issuable-type=
"issuableType"
:update-url=
"updateEndpoint"
:update-url=
"updateEndpoint"
:lock-version=
"state.lock_version"
:lock-version=
"state.lock_version"
@
taskListUpdateFailed=
"updateStoreState"
/>
/>
<edited-component
<edited-component
v-if=
"hasUpdated"
v-if=
"hasUpdated"
...
...
app/assets/javascripts/issue_show/components/description.vue
View file @
7ad76a54
...
@@ -89,8 +89,10 @@ export default {
...
@@ -89,8 +89,10 @@ export default {
}
}
},
},
taskListUpdateError
(
data
)
{
taskListUpdateError
({
errors
,
data
})
{
createFlash
(
data
.
errors
[
0
]);
createFlash
(
'
Someone edited this issue at the same time you did and we updated the issue description.
'
);
this
.
$emit
(
'
taskListUpdateFailed
'
);
},
},
updateTaskStatusText
()
{
updateTaskStatusText
()
{
...
...
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