jenkins-bot has submitted this change and it was merged.
Change subject: mw.ViewPageTarget: Surface error messages from core edit api
......................................................................
mw.ViewPageTarget: Surface error messages from core edit api
Previously we only looked at error info/code from the root of
the API response, not the ones from the root of the response
that action=visualeditoredit forwards from action=edit.
This changes the message for e.g. AbuseFilter from:
> Error: Invalid error code
to:
> Error: Hit AbuseFilter: [name of triggered filter]
Also changed default error for other reasons (e.g. hooks of other
extensions that we don't yet have specific support for) to "Unknown error"
instead of "Invalid error code".
Bug: 50472
Change-Id: I3b32eddafd8fff83f323606f9922ac60b5d3b58e
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index 2de2c9d..c26db5b 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -581,7 +581,13 @@
// Handle (other) unknown and/or unrecoverable errors
this.showMessage(
'api-save-error',
- document.createTextNode( data.error && ( data.error.info ||
data.error.code ) || 'Invalid error code' ),
+ document.createTextNode(
+ editApi.info ||
+ ( data.error && data.error.info ) ||
+ editApi.code ||
+ ( data.error && data.error.code ) ||
+ 'Unknown error'
+ ),
{
wrap: 'error'
}
--
To view, visit https://gerrit.wikimedia.org/r/73877
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3b32eddafd8fff83f323606f9922ac60b5d3b58e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
