jenkins-bot has submitted this change and it was merged.
Change subject: Show HTML representation of detailed error-message in
error-tooltip
......................................................................
Show HTML representation of detailed error-message in error-tooltip
Bug: 46369
Bug: 46073
Bug: 41602
Change-Id: I72778dbed2c30fe18d921895d42e23c6ee4af8ce
---
M lib/resources/wikibase.RepoApi/wikibase.RepoApiError.js
M lib/resources/wikibase.ui.Tooltip.js
2 files changed, 8 insertions(+), 2 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
Objections:
Hoo man: There's a problem with this change, please improve
diff --git a/lib/resources/wikibase.RepoApi/wikibase.RepoApiError.js
b/lib/resources/wikibase.RepoApi/wikibase.RepoApiError.js
index 9779b12..b40cae2 100644
--- a/lib/resources/wikibase.RepoApi/wikibase.RepoApiError.js
+++ b/lib/resources/wikibase.RepoApi/wikibase.RepoApiError.js
@@ -99,7 +99,13 @@
var detailedMessage = '';
if ( details.error ) {
- detailedMessage = details.error.info;
+ if ( details.error.messages &&
details.error.messages.html ) {
+ // TODO: where does this "*" come from? we
should get rid of it!
+ // TODO: there's a "\n" inside the HTML, we
should get rid of it in the backend.
+ detailedMessage =
details.error.messages.html['*'];
+ } else {
+ detailedMessage = details.error.info;
+ }
} else if ( details.exception ) {
errorCode = details.textStatus;
detailedMessage = details.exception;
diff --git a/lib/resources/wikibase.ui.Tooltip.js
b/lib/resources/wikibase.ui.Tooltip.js
index 62241e3..82d52f2 100644
--- a/lib/resources/wikibase.ui.Tooltip.js
+++ b/lib/resources/wikibase.ui.Tooltip.js
@@ -157,7 +157,7 @@
var $detailedMessage = $( '<div/>', {
'class': 'wb-tooltip-error-details',
- text: this._error.detailedMessage
+ html: this._error.detailedMessage
} ).hide(); // hide detail message initially!
var $toggler = $( '<a/>' )
--
To view, visit https://gerrit.wikimedia.org/r/64083
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I72778dbed2c30fe18d921895d42e23c6ee4af8ce
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Daniel Werner <[email protected]>
Gerrit-Reviewer: Henning Snater <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
