Merge "mw.Upload.BookletLayout: Go back to upload page on upload error"

diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
index d75e1d3..42312dd 100644 (file)
--- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
@@ -195,11 +195,15 @@
                // These errors will be thrown while the user is on the info page
                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;
                        }
                } );
@@ -235,12 +239,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;
                                }