jenkins-bot has submitted this change and it was merged.
Change subject: Account for non-API errors in error handling code
......................................................................
Account for non-API errors in error handling code
If an error came from an HTTP error rather than an API error response,
errorObj.error won't be defined, and we need to look at errorObj.exception
instead.
Change-Id: I91632768bef271de3c7fe6ba2192fba1be4142b0
---
M modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js
M modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js
M modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js
3 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Sbisson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js
b/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js
index e788dd0..b0647fc 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js
@@ -172,7 +172,7 @@
widget.showContent( true );
} )
.then( null, function ( errorCode, errorObj ) {
- var $errorMessage = $( '<span>' ).text(
errorObj.error.info );
+ var $errorMessage = $( '<span>' ).text(
errorObj.error && errorObj.error.info || errorObj.exception );
widget.error.setLabel( $errorMessage );
widget.error.toggle( true );
} )
@@ -220,7 +220,7 @@
widget.$content.empty().append( $.parseHTML(
desc.content.content ) );
} )
.then( null, function ( errorCode, errorObj ) {
- var $errorMessage = $( '<span>' ).text(
errorObj.error.info );
+ var $errorMessage = $( '<span>' ).text(
errorObj.error && errorObj.error.info || errorObj.exception );
widget.error.setLabel( $errorMessage );
widget.error.toggle( true );
} )
diff --git a/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js
b/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js
index dfba77b..17502fa 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js
@@ -126,7 +126,7 @@
widget.emit( 'save', topicId );
} )
.then( null, function ( errorCode, errorObj ) {
- var $errorMessage = $( '<span>' ).text(
errorObj.error.info );
+ var $errorMessage = $( '<span>' ).text(
errorObj.error && errorObj.error.info || errorObj.exception );
widget.error.setLabel( $errorMessage );
widget.error.toggle( true );
} )
diff --git a/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js
b/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js
index 5279c71..a3813cc 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js
@@ -125,7 +125,7 @@
widget.emit( 'saveContent', workflow, content,
format );
} )
.then( null, function ( errorCode, errorObj ) {
- var $errorMessage = $( '<span>' ).text(
errorObj.error.info );
+ var $errorMessage = $( '<span>' ).text(
errorObj.error && errorObj.error.info || errorObj.exception );
widget.error.setLabel( $errorMessage );
widget.error.toggle( true );
} )
--
To view, visit https://gerrit.wikimedia.org/r/231718
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I91632768bef271de3c7fe6ba2192fba1be4142b0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Sbisson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
