jenkins-bot has submitted this change and it was merged.
Change subject: Added fixes for template creation, when generated by Page
Schemas
......................................................................
Added fixes for template creation, when generated by Page Schemas
Change-Id: Ie1152e708d9430f13442391d3f9613851fb3ce2c
---
M includes/SF_TemplateField.php
1 file changed, 26 insertions(+), 7 deletions(-)
Approvals:
Yaron Koren: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/SF_TemplateField.php b/includes/SF_TemplateField.php
index a007c36..845a329 100644
--- a/includes/SF_TemplateField.php
+++ b/includes/SF_TemplateField.php
@@ -265,6 +265,9 @@
$tableText .= "\n==" . $field->mLabel
. "==\n";
}
} elseif ( $field->mDisplay == 'nonempty' ) {
+ if ( $template_format == 'plain' ||
$template_format == 'sections' ) {
+ $tableText .= "\n";
+ }
$tableText .= '{{#if:{{{' . $field->mFieldName
. '|}}}|';
if ( $template_format == 'standard' ||
$template_format == 'infobox' ) {
if ( $i > 0 ) {
@@ -273,22 +276,22 @@
$tableText .= '! ' . $field->mLabel .
"\n";
$separator = '{{!}}';
} elseif ( $template_format == 'plain' ) {
- $tableText .= "'''" . $field->mLabel .
"''' ";
+ $tableText .= "'''" . $field->mLabel .
":''' ";
+ $separator = '';
} elseif ( $template_format == 'sections' ) {
$tableText .= '==' . $field->mLabel .
"==\n";
+ $separator = '';
}
} // If it's 'hidden', do nothing
// Value column
-/*
if ( $template_format == 'standard' || $template_format
== 'infobox' ) {
if ( $field->mDisplay == 'hidden' ) {
} elseif ( $field->mDisplay == 'nonempty' ) {
- $tableText .= "{{!}} ";
+ //$tableText .= "{{!}} ";
} else {
$tableText .= "| ";
}
}
-*/
if ( !$field->mSemanticProperty ) {
$tableText .= "$separator $fieldBefore {{{" .
$field->mFieldName . "|}}} $fieldAfter\n";
if ( $field->mDisplay == 'nonempty' ) {
@@ -296,7 +299,14 @@
}
$tableText .= "\n";
} elseif ( !is_null( $internalObjText ) ) {
- $tableText .= "$separator $fieldBefore {{{" .
$field->mFieldName . "|}}} $fieldAfter\n";
+ if ( $separator != '' || $fieldBefore != '' ) {
+ $tableText .= "$separator $fieldBefore
";
+ }
+ $tableText .= "{{{" . $field->mFieldName .
"|}}} $fieldAfter";
+ if ( $field->mDisplay == 'nonempty' ) {
+ $tableText .= " }}";
+ }
+ $tableText .= "\n";
if ( $field->mIsList ) {
if ( $useSubobject ) {
$internalObjText .= '|' .
$field->mSemanticProperty . '={{{' . $field->mFieldName . '|}}}|+sep=,';
@@ -313,7 +323,13 @@
$setText .= $field->mSemanticProperty .
'={{{' . $field->mFieldName . '|}}}|';
}
} elseif ( $field->mDisplay == 'nonempty' ) {
- $tableText .= '{{!}} ' . $fieldBefore . ' [[' .
$field->mSemanticProperty . '::{{{' . $field->mFieldName . "|}}}]]}}
$fieldAfter\n";
+ if ( $template_format == 'standard' ||
$template_format == 'infobox' ) {
+ $tableText .= '{{!}} ';
+ }
+ if ( $fieldBefore != '' ) {
+ $tableText .= $fieldBefore . ' ';
+ }
+ $tableText .= '[[' . $field->mSemanticProperty
. '::{{{' . $field->mFieldName . "|}}}]]}} $fieldAfter\n";
} elseif ( $field->mIsList ) {
// If this field is meant to contain a list,
// add on an 'arraymap' function, that will
@@ -333,7 +349,10 @@
}
$tableText .= "{{#arraymap:{{{" .
$field->mFieldName . "|}}}|" . $field->mDelimiter . "|$var|[[" .
$field->mSemanticProperty . "::$var]]}}\n";
} else {
- $tableText .= "" . $fieldBefore . " [[" .
$field->mSemanticProperty . "::{{{" . $field->mFieldName . "|}}}]]
$fieldAfter\n";
+ if ( $fieldBefore != '' ) {
+ $tableText .= $fieldBefore . ' ';
+ }
+ $tableText .= '[[' . $field->mSemanticProperty
. "::{{{" . $field->mFieldName . "|}}}]] $fieldAfter\n";
}
}
--
To view, visit https://gerrit.wikimedia.org/r/98596
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1152e708d9430f13442391d3f9613851fb3ce2c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren <yaro...@gmail.com>
Gerrit-Reviewer: Yaron Koren <yaro...@gmail.com>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
