r113584 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r113583‎ | r113584 | r113585 >
Date:20:06, 11 March 2012
Author:jeroendedauw
Status:reverted
Tags:gerritmigration 
Comment:
adressing (part of) bug 33341
Modified paths:
  • /trunk/extensions/UploadWizard/UploadWizard.config.php (modified) (history)
  • /trunk/extensions/UploadWizard/UploadWizard.i18n.php (modified) (history)
  • /trunk/extensions/UploadWizard/includes/UploadWizardCampaign.php (modified) (history)
  • /trunk/extensions/UploadWizard/includes/specials/SpecialUploadWizard.php (modified) (history)
  • /trunk/extensions/UploadWizard/resources/mw.UploadWizardDetails.js (modified) (history)

Diff [purge]

Index: trunk/extensions/UploadWizard/UploadWizard.config.php
@@ -75,6 +75,9 @@
7676 // The maximum length of the id field.
7777 'idFieldMaxLength' => 25,
7878
 79+ // Initial value for the id field.
 80+ 'idFieldInitialValue' => '',
 81+
7982 // 'licenses' is a list of licenses you could possibly use elsewhere, for instance in
8083 // licensesOwnWork or licensesThirdParty.
8184 // It just describes what licenses go with what wikitext, and how to display them in
Index: trunk/extensions/UploadWizard/includes/UploadWizardCampaign.php
@@ -180,6 +180,9 @@
181181 'idFieldMaxLength' => array(
182182 'type' => 'int',
183183 ),
 184+ 'idFieldInitialValue' => array(
 185+ 'type' => 'text',
 186+ ),
184187 'ownWorkOption' => array(
185188 'type' => 'radio',
186189 'options' => array(
Index: trunk/extensions/UploadWizard/includes/specials/SpecialUploadWizard.php
@@ -57,6 +57,10 @@
5858 $skip = in_array( $wgRequest->getText( 'skiptutorial' ), array( '1', 'true' ) );
5959 UploadWizardConfig::setUrlSetting( 'skipTutorial', $skip );
6060 }
 61+
 62+ if ( $wgRequest->getCheck( 'id' ) ) {
 63+ UploadWizardConfig::setUrlSetting( 'idFieldInitialValue', $wgRequest->getText( 'id' ) );
 64+ }
6165
6266 $this->handleCampaign();
6367
Index: trunk/extensions/UploadWizard/UploadWizard.i18n.php
@@ -323,6 +323,7 @@
324324 'mwe-upwiz-campaign-conf-idField' => 'ID field wikitext. Example: <nowiki>{{Rijksmonument|$1}}</nowiki>. Blank to not display field:',
325325 'mwe-upwiz-campaign-conf-idFieldLabel' => 'ID field label text:',
326326 'mwe-upwiz-campaign-conf-idFieldLabelPage' => 'Page name with text for the ID field label. $1 is replaced with the language code:',
 327+ 'mwe-upwiz-campaign-conf-idFieldInitialValue' => 'Initial value for the ID field.',
327328 'mwe-upwiz-campaign-conf-headerLabelPage' => 'Page containing text to display above the UploadWizard interface. $1 is replaced with the language code:',
328329 'mwe-upwiz-campaign-conf-thanksLabelPage' => 'Page containing text to display on top of the "Use" page. $1 is replaced with the language code:',
329330 'mwe-upwiz-campaign-conf-idFieldMaxLength' => 'Maximum length of the text in the ID field',
Index: trunk/extensions/UploadWizard/resources/mw.UploadWizardDetails.js
@@ -217,7 +217,9 @@
218218 'name': idFieldId,
219219 'class': 'mwe-idfield',
220220 'maxlength': mw.UploadWizard.config.idFieldMaxLength
221 - } );
 221+ } );
 222+
 223+ _this.idFieldInput.val( mw.UploadWizard.config.idFieldInitialValue );
222224
223225 _this.$form.append(
224226 $j( '<div class="mwe-upwiz-details-input-error"><label class="mwe-validator-error" for="' + idFieldId + '" generated="true"/></div>' ),

Follow-up revisions

RevisionCommit summaryAuthorDate
r113591adderss bug 33341jeroendedauw21:40, 11 March 2012
r114400Revert r112166, r112229, r112248, r113584, r113591, r114349: unreviewed revis...catrope20:21, 21 March 2012

Status & tagging log