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
f1acd505
Commit
f1acd505
authored
Jan 07, 2019
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show error message from backend
parent
45eabf92
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
app/assets/javascripts/issue_show/components/app.vue
app/assets/javascripts/issue_show/components/app.vue
+7
-1
spec/javascripts/issue_show/components/app_spec.js
spec/javascripts/issue_show/components/app_spec.js
+2
-2
No files found.
app/assets/javascripts/issue_show/components/app.vue
View file @
f1acd505
...
@@ -250,8 +250,14 @@ export default {
...
@@ -250,8 +250,14 @@ export default {
if
(
error
&&
error
.
name
===
'
SpamError
'
)
{
if
(
error
&&
error
.
name
===
'
SpamError
'
)
{
this
.
openRecaptcha
();
this
.
openRecaptcha
();
}
else
{
}
else
{
let
errMsg
=
`Error updating
${
this
.
issuableType
}
`
;
if
(
error
&&
error
.
response
&&
error
.
response
.
data
&&
error
.
response
.
data
.
errors
)
{
errMsg
=
error
.
response
.
data
.
errors
;
}
eventHub
.
$emit
(
'
close.form
'
);
eventHub
.
$emit
(
'
close.form
'
);
window
.
Flash
(
`Error updating
${
this
.
issuableType
}
`
);
window
.
Flash
(
errMsg
);
}
}
});
});
},
},
...
...
spec/javascripts/issue_show/components/app_spec.js
View file @
f1acd505
...
@@ -292,8 +292,8 @@ describe('Issuable output', () => {
...
@@ -292,8 +292,8 @@ describe('Issuable output', () => {
it
(
'
shows error mesage from backend if exists
'
,
done
=>
{
it
(
'
shows error mesage from backend if exists
'
,
done
=>
{
const
msg
=
'
Custom error message from backend
'
;
const
msg
=
'
Custom error message from backend
'
;
spyOn
(
vm
.
service
,
'
updateIssuable
'
).
and
.
callFake
(
()
=>
spyOn
(
vm
.
service
,
'
updateIssuable
'
).
and
.
callFake
(
Promise
.
reject
({
response
:
{
data
:
{
errors
:
msg
}
}
}),
// eslint-disable-line prefer-promise-reject-errors
()
=>
Promise
.
reject
({
response
:
{
data
:
{
errors
:
msg
}
}
}),
// eslint-disable-line prefer-promise-reject-errors
);
);
vm
.
updateIssuable
();
vm
.
updateIssuable
();
...
...
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