Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/242717
Change subject: mw.Upload.BookletLayout: Make all errors unrecoverable
......................................................................
mw.Upload.BookletLayout: Make all errors unrecoverable
Any error apart from 503's can't be recovered just by hitting 'Try
Again'. The user will _have_ to make some changes before the process
can continue.
Bug: T114130
Change-Id: I8e2d619be5b7e47bc903155c353bc1da36a62bb6
---
M resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
1 file changed, 12 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/17/242717/1
diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
index fa2fb0b..df28611 100644
--- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
@@ -190,11 +190,15 @@
} );
this.uploadPromise.always( function () {
if ( layout.upload.getState() === mw.Upload.State.ERROR
) {
- deferred.reject( new OO.ui.Error( mw.msg(
'upload-process-error' ) ) );
+ deferred.reject( new OO.ui.Error( mw.msg(
'upload-process-error' ), {
+ recoverable: false
+ } ) );
return false;
}
if ( layout.upload.getState() ===
mw.Upload.State.WARNING ) {
- deferred.reject( new OO.ui.Error( mw.msg(
'upload-process-error' ) ) );
+ deferred.reject( new OO.ui.Error( mw.msg(
'upload-process-error' ), {
+ recoverable: false
+ } ) );
return false;
}
} );
@@ -225,12 +229,16 @@
var name;
if ( layout.upload.getState() ===
mw.Upload.State.ERROR ) {
- deferred.reject( new OO.ui.Error(
mw.msg( 'upload-process-error' ) ) );
+ deferred.reject( new OO.ui.Error(
mw.msg( 'upload-process-error' ), {
+ recoverable: false
+ } ) );
return false;
}
if ( layout.upload.getState() ===
mw.Upload.State.WARNING ) {
- deferred.reject( new OO.ui.Error(
mw.msg( 'upload-process-warning' ) ) );
+ deferred.reject( new OO.ui.Error(
mw.msg( 'upload-process-warning' ), {
+ recoverable: false
+ } ) );
return false;
}
--
To view, visit https://gerrit.wikimedia.org/r/242717
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e2d619be5b7e47bc903155c353bc1da36a62bb6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Prtksxna <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
