jenkins-bot has submitted this change and it was merged.
Change subject: Fix bugs related to showing API error messages
......................................................................
Fix bugs related to showing API error messages
Change-Id: I3516333e53a0fd272ff08e5a116f2e08571f9869
---
M src/FormatValueCaller.js
M src/ParseValueCaller.js
M src/RepoApiError.js
3 files changed, 7 insertions(+), 7 deletions(-)
Approvals:
Jonas Kress (WMDE): Looks good to me, approved
Daniel Kinzler: Looks good to me, but someone else must approve
Addshore: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/src/FormatValueCaller.js b/src/FormatValueCaller.js
index e03e4af..dab6d4b 100644
--- a/src/FormatValueCaller.js
+++ b/src/FormatValueCaller.js
@@ -98,8 +98,8 @@
'The formatter API returned an
unexpected result'
) );
}
- } ).fail( function( code, details ) {
- deferred.reject(
wb.api.RepoApiError.newFromApiResponse( code, details ) );
+ } ).fail( function( errorCode, error ) {
+ deferred.reject(
wb.api.RepoApiError.newFromApiResponse( error ) );
} );
return deferred.promise();
diff --git a/src/ParseValueCaller.js b/src/ParseValueCaller.js
index e647112..160c7e6 100644
--- a/src/ParseValueCaller.js
+++ b/src/ParseValueCaller.js
@@ -87,8 +87,8 @@
deferred.resolve( dataValuesSerializations );
- } ).fail( function( code, details ) {
- deferred.reject(
wb.api.RepoApiError.newFromApiResponse( code, details ) );
+ } ).fail( function( errorCode, error ) {
+ deferred.reject(
wb.api.RepoApiError.newFromApiResponse( error ) );
} );
return deferred.promise();
diff --git a/src/RepoApiError.js b/src/RepoApiError.js
index 6fee018..da238e3 100644
--- a/src/RepoApiError.js
+++ b/src/RepoApiError.js
@@ -15,7 +15,7 @@
* @constructor
*
* @param {string} code Error code (used to determine the actual error
message).
- * @param {string} detailedMessage Detailed error information.
+ * @param {string} detailedMessage HTML
* @param {string} [action] Generic API action (e.g. "save" or "cancel") used
to determine a
* specific message.
*/
@@ -93,12 +93,12 @@
detailedMessage = messagesObjectToHtml(
details.error.messages );
} else {
// Wikibase API no-HTML error message fall-back.
- detailedMessage = details.error.info;
+ detailedMessage = mw.html.escape( details.error.info );
}
} else if ( details.exception ) {
// Failed MediaWiki API call.
errorCode = details.textStatus;
- detailedMessage = details.exception;
+ detailedMessage = mw.html.escape( details.exception );
}
return new SELF( errorCode, detailedMessage, apiAction );
--
To view, visit https://gerrit.wikimedia.org/r/298505
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3516333e53a0fd272ff08e5a116f2e08571f9869
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseJavaScriptApi
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Adrian Heine <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
