https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113584
Revision: 113584
Author: jeroendedauw
Date: 2012-03-11 20:06:20 +0000 (Sun, 11 Mar 2012)
Log Message:
-----------
adressing (part of) bug 33341
Modified Paths:
--------------
trunk/extensions/UploadWizard/UploadWizard.config.php
trunk/extensions/UploadWizard/UploadWizard.i18n.php
trunk/extensions/UploadWizard/includes/UploadWizardCampaign.php
trunk/extensions/UploadWizard/includes/specials/SpecialUploadWizard.php
trunk/extensions/UploadWizard/resources/mw.UploadWizardDetails.js
Modified: trunk/extensions/UploadWizard/UploadWizard.config.php
===================================================================
--- trunk/extensions/UploadWizard/UploadWizard.config.php 2012-03-11
19:04:37 UTC (rev 113583)
+++ trunk/extensions/UploadWizard/UploadWizard.config.php 2012-03-11
20:06:20 UTC (rev 113584)
@@ -75,6 +75,9 @@
// The maximum length of the id field.
'idFieldMaxLength' => 25,
+ // Initial value for the id field.
+ 'idFieldInitialValue' => '',
+
// 'licenses' is a list of licenses you could possibly use elsewhere,
for instance in
// licensesOwnWork or licensesThirdParty.
// It just describes what licenses go with what wikitext, and how to
display them in
Modified: trunk/extensions/UploadWizard/UploadWizard.i18n.php
===================================================================
--- trunk/extensions/UploadWizard/UploadWizard.i18n.php 2012-03-11 19:04:37 UTC
(rev 113583)
+++ trunk/extensions/UploadWizard/UploadWizard.i18n.php 2012-03-11 20:06:20 UTC
(rev 113584)
@@ -323,6 +323,7 @@
'mwe-upwiz-campaign-conf-idField' => 'ID field wikitext. Example:
<nowiki>{{Rijksmonument|$1}}</nowiki>. Blank to not display field:',
'mwe-upwiz-campaign-conf-idFieldLabel' => 'ID field label text:',
'mwe-upwiz-campaign-conf-idFieldLabelPage' => 'Page name with text for
the ID field label. $1 is replaced with the language code:',
+ 'mwe-upwiz-campaign-conf-idFieldInitialValue' => 'Initial value for the
ID field.',
'mwe-upwiz-campaign-conf-headerLabelPage' => 'Page containing text to
display above the UploadWizard interface. $1 is replaced with the language
code:',
'mwe-upwiz-campaign-conf-thanksLabelPage' => 'Page containing text to
display on top of the "Use" page. $1 is replaced with the language code:',
'mwe-upwiz-campaign-conf-idFieldMaxLength' => 'Maximum length of the
text in the ID field',
Modified: trunk/extensions/UploadWizard/includes/UploadWizardCampaign.php
===================================================================
--- trunk/extensions/UploadWizard/includes/UploadWizardCampaign.php
2012-03-11 19:04:37 UTC (rev 113583)
+++ trunk/extensions/UploadWizard/includes/UploadWizardCampaign.php
2012-03-11 20:06:20 UTC (rev 113584)
@@ -180,6 +180,9 @@
'idFieldMaxLength' => array(
'type' => 'int',
),
+ 'idFieldInitialValue' => array(
+ 'type' => 'text',
+ ),
'ownWorkOption' => array(
'type' => 'radio',
'options' => array(
Modified:
trunk/extensions/UploadWizard/includes/specials/SpecialUploadWizard.php
===================================================================
--- trunk/extensions/UploadWizard/includes/specials/SpecialUploadWizard.php
2012-03-11 19:04:37 UTC (rev 113583)
+++ trunk/extensions/UploadWizard/includes/specials/SpecialUploadWizard.php
2012-03-11 20:06:20 UTC (rev 113584)
@@ -57,6 +57,10 @@
$skip = in_array( $wgRequest->getText( 'skiptutorial'
), array( '1', 'true' ) );
UploadWizardConfig::setUrlSetting( 'skipTutorial',
$skip );
}
+
+ if ( $wgRequest->getCheck( 'id' ) ) {
+ UploadWizardConfig::setUrlSetting(
'idFieldInitialValue', $wgRequest->getText( 'id' ) );
+ }
$this->handleCampaign();
Modified: trunk/extensions/UploadWizard/resources/mw.UploadWizardDetails.js
===================================================================
--- trunk/extensions/UploadWizard/resources/mw.UploadWizardDetails.js
2012-03-11 19:04:37 UTC (rev 113583)
+++ trunk/extensions/UploadWizard/resources/mw.UploadWizardDetails.js
2012-03-11 20:06:20 UTC (rev 113584)
@@ -217,7 +217,9 @@
'name': idFieldId,
'class': 'mwe-idfield',
'maxlength': mw.UploadWizard.config.idFieldMaxLength
- } );
+ } );
+
+ _this.idFieldInput.val(
mw.UploadWizard.config.idFieldInitialValue );
_this.$form.append(
$j( '<div class="mwe-upwiz-details-input-error"><label
class="mwe-validator-error" for="' + idFieldId + '" generated="true"/></div>' ),
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
