X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=resources%2Fsrc%2Fmediawiki%2Fmediawiki.Upload.BookletLayout.js;h=f736036ecf38c20b253e967980b02dca73719966;hb=892b17237bb44630fa6f508c5bf85374a62def13;hp=7c4855fb2f406d8e335a695f65cfc3b71e75ce3b;hpb=59e7337ea612d03d08b67e6ada707e3d7ced738d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
index 7c4855fb2f..f736036ecf 100644
--- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
@@ -1,4 +1,4 @@
-/*global moment*/
+/* global moment*/
 ( function ( $, mw, moment ) {
 
 	/**
@@ -176,24 +176,18 @@
 
 		return this.upload.getApi().then(
 			function ( api ) {
-				return $.when(
-					booklet.upload.loadConfig().then(
-						null,
-						function ( errorMsg ) {
-							booklet.getPage( 'upload' ).$element.msg( errorMsg );
-							return $.Deferred().resolve();
-						}
-					),
-					// If the user can't upload anything, don't give them the option to.
-					api.getUserInfo().then( function ( userInfo ) {
+				// If the user can't upload anything, don't give them the option to.
+				return api.getUserInfo().then(
+					function ( userInfo ) {
 						if ( userInfo.rights.indexOf( 'upload' ) === -1 ) {
-							// TODO Use a better error message when not all logged-in users can upload
-							booklet.getPage( 'upload' ).$element.msg( 'api-error-mustbeloggedin' );
+							if ( mw.user.isAnon() ) {
+								booklet.getPage( 'upload' ).$element.msg( 'api-error-mustbeloggedin' );
+							} else {
+								booklet.getPage( 'upload' ).$element.msg( 'api-error-badaccess-groups' );
+							}
 						}
 						return $.Deferred().resolve();
-					} )
-				).then(
-					null,
+					},
 					// Always resolve, never reject
 					function () { return $.Deferred().resolve(); }
 				);