Nischayn22 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/52981
Change subject: (bug 39607) user preference for maxSimultaneousUpload
......................................................................
(bug 39607) user preference for maxSimultaneousUpload
Consider the user preferences for maximum number of simultaneous uploads.
The user can select a value only lower than that set by the server-side
config.
Since the user set value is smaller than the server-side config the JS
only checks for the user setting.
Change-Id: I30cc9c0629c0d38a72bd04000b04579686f4f920
---
M UploadWizardHooks.php
M resources/mw.UploadWizard.js
2 files changed, 19 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/81/52981/1
diff --git a/UploadWizardHooks.php b/UploadWizardHooks.php
index e12c89f..c6f6eb2 100644
--- a/UploadWizardHooks.php
+++ b/UploadWizardHooks.php
@@ -562,6 +562,8 @@
*/
public static function onGetPreferences( User $user, array
&$preferences ) {
+ $config = UploadWizardConfig::getConfig();
+
// User preference to skip the licensing tutorial, provided
it's not globally disabled
if ( UploadWizardConfig::getSetting( 'skipTutorial' ) == false
) {
$preferences['upwiz_skiptutorial'] = array(
@@ -607,6 +609,22 @@
}
}
+ // Setting for maximum number of simultaneous uploads (always
lower than the server-side config)
+ if( $config[ 'maxSimultaneousConnections' ] > 1 ) {
+
+ // Hack to make the key and value the same otherwise
options are added wrongly.
+ $range = range( 0, $config[
'maxSimultaneousConnections' ] );
+ unset( $range[0] );
+
+ $preferences['upwiz_maxsimultaneous'] = array(
+ 'type' => 'select',
+ 'label-message' => 'mwe-upwiz-sim',
+ 'section' => 'uploads/upwiz-experimental',
+ 'default' => $config[
'maxSimultaneousConnections' ],
+ 'options' => $range
+ );
+ }
+
return true;
}
diff --git a/resources/mw.UploadWizard.js b/resources/mw.UploadWizard.js
index e044053..623cf7a 100644
--- a/resources/mw.UploadWizard.js
+++ b/resources/mw.UploadWizard.js
@@ -15,7 +15,7 @@
// XXX need a robust way of defining default config
this.maxUploads = mw.UploadWizard.config[ 'maxUploads' ] || 10;
- this.maxSimultaneousConnections = mw.UploadWizard.config[
'maxSimultaneousConnections' ] || 2;
+ this.maxSimultaneousConnections = mw.user.options.get(
'upwiz_maxsimultaneous' ) || 1;
this.makePreviewsFlag = true;
this.showDeed = false;
--
To view, visit https://gerrit.wikimedia.org/r/52981
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30cc9c0629c0d38a72bd04000b04579686f4f920
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Nischayn22 <nischay...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
