Yaron Koren has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370608 )
Change subject: Fixes for Cargo handling in Special:CreateTemplate
......................................................................
Fixes for Cargo handling in Special:CreateTemplate
Change-Id: I647d9b6fe9ad24e6915d1480a0b14bb83fee6c11
---
M libs/PF_CreateTemplate.js
M specials/PF_CreateTemplate.php
2 files changed, 9 insertions(+), 4 deletions(-)
Approvals:
Yaron Koren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/libs/PF_CreateTemplate.js b/libs/PF_CreateTemplate.js
index 4dcb541..cab466d 100644
--- a/libs/PF_CreateTemplate.js
+++ b/libs/PF_CreateTemplate.js
@@ -33,8 +33,8 @@
function validateCreateTemplateForm() {
var blankTemplateName = ( jQuery( '#template_name' ).val() === '' );
- var blankCargoTableName = ( jQuery( '#use_cargo' ).is(':checked') ||
- jQuery( '#table_name' ).val() === '' );
+ var blankCargoTableName = ( jQuery( '#use_cargo' ).is(':checked') &&
+ jQuery( '#cargo_table' ).val() === '' );
if ( blankTemplateName || blankCargoTableName ) {
scroll( 0, 0 );
if ( blankTemplateName ) {
diff --git a/specials/PF_CreateTemplate.php b/specials/PF_CreateTemplate.php
index 728ed7e..0ba2cce 100644
--- a/specials/PF_CreateTemplate.php
+++ b/specials/PF_CreateTemplate.php
@@ -202,8 +202,13 @@
$req->getVal( 'delimiter_' .
$id )
);
$field->setFieldType( $req->getVal(
'field_type_' . $id ) );
- // Fake attribute.
- $field->mAllowedValuesStr =
$req->getVal( 'allowed_values_' . $id );
+
+ if ( defined( 'CARGO_VERSION' ) ) {
+ $allowedValuesStr =
$req->getVal( 'allowed_values_' . $id );
+ $possibleValues =
CargoUtils::smartSplit( ',', $allowedValuesStr );
+ $field->setPossibleValues(
$possibleValues );
+ }
+
$fields[] = $field;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/370608
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I647d9b6fe9ad24e6915d1480a0b14bb83fee6c11
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren <[email protected]>
Gerrit-Reviewer: Yaron Koren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
