Yaron Koren has submitted this change and it was merged.
Change subject: Extended Page Schemas integration
......................................................................
Extended Page Schemas integration
1. Allow to specify field description and "before field" text in generated form
2. Allow to choose which standard inputs will be available in generated form
(free text, minor edit, preview button, etc)
3. Adds some new hooks in field template generation:
- 'SfTemplateFieldBefore', allow to specify "before" text for generated
template
- 'SfTemplateTextBefore', allow to specify "before" text for field in template
- 'SfTemplateFieldAfter', allow to specify "after" text for field in template
- 'SfTemplateFieldArrayMap', allow to specify template for list-type fields
- 'SfTemplateTextAfter', allow to specify "after" text for generated template
Change-Id: I10276b51c5fc755efb6ffce6390de47aac10cdc7
---
M includes/SF_FormField.php
M includes/SF_PageSchemas.php
M includes/SF_TemplateField.php
3 files changed, 251 insertions(+), 15 deletions(-)
Approvals:
Yaron Koren: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/includes/SF_FormField.php b/includes/SF_FormField.php
index b702ea4..ba5c1ed 100644
--- a/includes/SF_FormField.php
+++ b/includes/SF_FormField.php
@@ -258,11 +258,31 @@
// such templates in form definitions gets more sophisticated
function createMarkup( $part_of_multiple, $is_last_field_in_template ) {
$text = "";
+ $descPlaceholder = "";
+ $textBeforeField = "";
+
+ if ( array_key_exists( "Description", $this->mFieldArgs ) ) {
+ if ( $this->mFieldArgs['Description'] != '' ) {
+ if (
isset($this->mFieldArgs['DescriptionTooltipMode']) )
+ {
+ $descPlaceholder = '
{{#info:'.$this->mFieldArgs['Description'].'}}';
+ }else{
+ $descPlaceholder = '<br><p
class="sfFieldDescription" style="font-size:0.7em; color:gray;">' .
$this->mFieldArgs['Description'] . '</p>';
+ }
+ }
+ }
+
+ if ( array_key_exists( "TextBeforeField", $this->mFieldArgs ) )
{
+ if ( $this->mFieldArgs['TextBeforeField'] != '' ) {
+ $textBeforeField =
$this->mFieldArgs['TextBeforeField'];
+ }
+ }
+
if ( $this->template_field->getLabel() !== '' ) {
if ( $part_of_multiple ) {
- $text .= "'''" .
$this->template_field->getLabel() . ":''' ";
+ $text .= "'''" . $textBeforeField .
$this->template_field->getLabel() . ":''' $descPlaceholder";
} else {
- $text .= "! " .
$this->template_field->getLabel() . ":\n";
+ $text .= "! " . $textBeforeField .
$this->template_field->getLabel() . ":$descPlaceholder\n";
}
}
if ( ! $part_of_multiple ) { $text .= "| "; }
@@ -343,6 +363,7 @@
global $wgParser;
foreach ( $other_args as $argname => $argvalue ) {
+
if ( is_string( $argvalue ) ) {
$other_args[$argname] =
$wgParser->recursiveTagParse( $argvalue
);
diff --git a/includes/SF_PageSchemas.php b/includes/SF_PageSchemas.php
index 49806f4..45e83ea 100644
--- a/includes/SF_PageSchemas.php
+++ b/includes/SF_PageSchemas.php
@@ -22,6 +22,20 @@
*/
public static function createPageSchemasObject( $tagName, $xml ) {
$sfarray = array();
+
+ if( $tagName == "standardInputs" ) {
+ foreach ( $xml->children() as $tag => $child ) {
+ foreach ( $child->children() as $tag =>
$formelem ) {
+ if($tag == $tagName) {
+ foreach(
$formelem->attributes() as $attr => $name) {
+ $sfarray[$attr]
= (string)$formelem->attributes()->$attr;
+ }
+ }
+ }
+ return $sfarray;
+ }
+ }
+
if ( $tagName == "semanticforms_Form" ) {
foreach ( $xml->children() as $tag => $child ) {
if ( $tag == $tagName ) {
@@ -51,8 +65,12 @@
if ( $prop->getName() ==
'InputType' ) {
$sfarray[$prop->getName()] = (string)$prop;
} else {
+ if (
(string)$prop->attributes()->name == '' ) {
+
$sfarray[$prop->getName()] = (string)$prop;
+ } else {
$sfarray[(string)$prop->attributes()->name] = (string)$prop;
}
+ }
}
return $sfarray;
}
@@ -69,12 +87,14 @@
$formName = null;
$xml = '';
+ $isStandardInputsOpen = false;
foreach ( $wgRequest->getValues() as $var => $val ) {
$val = str_replace( array( '<', '>' ), array( '<',
'>' ), $val );
if ( $var == 'sf_form_name' ) {
$formName = $val;
} elseif ( $var == 'sf_page_name_formula' ) {
if ( !empty( $val ) ) {
+ $val = Xml::escapeTagsOnly( $val );
$xml .= '<PageNameFormula>' . $val .
'</PageNameFormula>';
}
} elseif ( $var == 'sf_create_title' ) {
@@ -85,7 +105,49 @@
if ( !empty( $val ) ) {
$xml .= '<EditTitle>' . $val .
'</EditTitle>';
}
+ } elseif ( $var == 'sf_fi_free_text_label' ) {
+ $isStandardInputsOpen = true;
+ $xml .= '<standardInputs ';
+ if ( !empty( $val ) ) {
+ $xml .= 'freeTextLabel="' .
Xml::escapeTagsOnly( $val ) . '" ';
+ }
+ } /* Options */ elseif ( $var == 'sf_fi_free_text' ) {
+ if ( !empty( $val ) ) {
+ $xml .= 'inputFreeText="' . $val . '" ';
+ }
+ } elseif ( $var == 'sf_fi_summary' ) {
+ if ( !empty( $val ) ) {
+ $xml .= 'inputSummary="' . $val . '" ';
+ }
+ } elseif ( $var == 'sf_fi_minor_edit' ) {
+ if ( !empty( $val ) ) {
+ $xml .= 'inputMinorEdit="' . $val . '"
';
+ }
+ } elseif ( $var == 'sf_fi_watch' ) {
+ if ( !empty( $val ) ) {
+ $xml .= 'inputWatch="' . $val . '" ';
+ }
+ } elseif ( $var == 'sf_fi_save' ) {
+ if ( !empty( $val ) ) {
+ $xml .= 'inputSave="' . $val . '" ';
+ }
+ } elseif ( $var == 'sf_fi_preview' ) {
+ if ( !empty( $val ) ) {
+ $xml .= 'inputPreview="' . $val . '" ';
+ }
+ } elseif ( $var == 'sf_fi_changes' ) {
+ if ( !empty( $val ) ) {
+ $xml .= 'inputChanges="' . $val . '" ';
+ }
+ } elseif ( $var == 'sf_fi_cancel' ) {
+ if ( !empty( $val ) ) {
+ $xml .= 'inputCancel="' . $val . '"';
+ }
}
+ }
+ if($isStandardInputsOpen) {
+ $isStandardInputsOpen = false;
+ $xml .= ' />';
}
$xml = '<semanticforms_Form name="' . $formName . '" >' . $xml;
$xml .= '</semanticforms_Form>';
@@ -135,6 +197,24 @@
if ( !empty( $val ) ) {
$xml .= '<InputType>' . $val .
'</InputType>';
}
+ } elseif ( substr( $var, 0, 14 ) == 'sf_input_desc_' ) {
+
+ if ( $val !== '' ) {
+ $xml .= '<Description>' . $val .
'</Description>';
+ }
+
+ } elseif ( substr( $var, 0, 18 ) ==
'sf_input_desctool_' ) {
+
+ if ( $val !== '' ) {
+ $xml .= '<DescriptionTooltipMode>' .
$val . '</DescriptionTooltipMode>';
+ }
+
+ } elseif ( substr( $var, 0, 14 ) == 'sf_input_befo_' ) {
+
+ if ( $val !== '' ) {
+ $xml .= '<TextBeforeField>' . $val .
'</TextBeforeField>';
+ }
+
} elseif ( substr( $var, 0, 14 ) == 'sf_key_values_' ) {
if ( $val !== '' ) {
// replace the comma substitution
character that has no chance of
@@ -186,6 +266,11 @@
$createTitle = PageSchemas::getValueFromObject( $form_array,
'CreateTitle' );
$editTitle = PageSchemas::getValueFromObject( $form_array,
'EditTitle' );
+ //Inputs
+ $standardInputs = $pageSchemaObj->getObject( 'standardInputs' );
+
+ $freeTextLabel = html_entity_decode(
PageSchemas::getValueFromObject( $form_array, 'freeTextLabel' ) );
+
$text = "\t<p>" . wfMessage( 'ps-namelabel' )->escaped() . ' '
. Html::input( 'sf_form_name', $formName, 'text', array( 'size' => 15 ) ) .
"</p>\n";
// The checkbox isn't actually a field in the page schema -
// we set it based on whether or not a page formula has been
@@ -200,6 +285,54 @@
$text .= "\t<p id=\"sf-page-name-formula\">" . wfMessage(
'sf-pageschemas-pagenameformula' )->escaped() . ' ' . Html::input(
'sf_page_name_formula', $pageNameFormula, 'text', array( 'size' => 30 ) ) .
"</p>\n";
$text .= "\t<p>" . wfMessage( 'sf-pageschemas-createtitle'
)->escaped() . ' ' . Html::input( 'sf_create_title', $createTitle, 'text',
array( 'size' => 25 ) ) . "</p>\n";
$text .= "\t<p id=\"sf-edit-title\">" . wfMessage(
'sf-pageschemas-edittitle' )->escaped() . ' ' . Html::input( 'sf_edit_title',
$editTitle, 'text', array( 'size' => 25 ) ) . "</p>\n";
+
+ //Inputs
+ $text .= "<p>Define form buttons and inputs (will be enabled
all if not selected any): </p><p>";
+
+ $text .= "Free text label: " . Html::input(
'sf_fi_free_text_label', ( ( empty( $freeTextLabel ) ) ? wfMsgForContent(
'sf_form_freetextlabel' ) : $freeTextLabel ), 'text' ) . "</p><p>";
+
+ // Free text
+ $text .= '<span>';
+ $text .= Html::input( 'sf_fi_free_text', '1', 'checkbox',
array( 'id' => 'sf_fi_free_text', 'checked' =>
(isset($standardInputs['inputFreeText'])) ? $standardInputs['inputFreeText'] :
null ) );
+ $text .= Html::rawElement( 'label', array( 'for' =>
'sf_fi_free_text' ), 'Free text input' );
+ $text .= " </span>";
+ // Summary
+ $text .= '<span>';
+ $text .= Html::input( 'sf_fi_summary', '1', 'checkbox', array(
'id' => 'sf_fi_summary', 'checked' => (isset($standardInputs['inputSummary']))
? $standardInputs['inputSummary'] : null ) );
+ $text .= Html::rawElement( 'label', array( 'for' =>
'sf_fi_summary' ), 'Summary input' );
+ $text .= " </span>";
+ // Minor edit
+ $text .= '<span>';
+ $text .= Html::input( 'sf_fi_minor_edit', '1', 'checkbox',
array( 'id' => 'sf_fi_minor_edit', 'checked' =>
(isset($standardInputs['inputMinorEdit'])) ? $standardInputs['inputMinorEdit']
: null ) );
+ $text .= Html::rawElement( 'label', array( 'for' =>
'sf_fi_minor_edit' ), 'Minor edit input' );
+ $text .= " </span>";
+ // Watch
+ $text .= '<span>';
+ $text .= Html::input( 'sf_fi_watch', '1', 'checkbox', array(
'id' => 'sf_fi_watch', 'checked' => (isset($standardInputs['inputWatch'])) ?
$standardInputs['inputWatch'] : null ) );
+ $text .= Html::rawElement( 'label', array( 'for' =>
'sf_fi_watch' ), 'Watch input' );
+ $text .= " </span>";
+ // Save
+ $text .= '<span>';
+ $text .= Html::input( 'sf_fi_save', '1', 'checkbox', array(
'id' => 'sf_fi_save', 'checked' => (isset($standardInputs['inputSave'])) ?
$standardInputs['inputSave'] : null ) );
+ $text .= Html::rawElement( 'label', array( 'for' =>
'sf_fi_save' ), 'Save input' );
+ $text .= " </span>";
+ // Preview
+ $text .= '<span>';
+ $text .= Html::input( 'sf_fi_preview', '1', 'checkbox', array(
'id' => 'sf_fi_preview', 'checked' => (isset($standardInputs['inputPreview']))
? $standardInputs['inputPreview'] : null ) );
+ $text .= Html::rawElement( 'label', array( 'for' =>
'sf_fi_preview' ), 'Preview input' );
+ $text .= " </span>";
+ // Changes
+ $text .= '<span>';
+ $text .= Html::input( 'sf_fi_changes', '1', 'checkbox', array(
'id' => 'sf_fi_changes', 'checked' => (isset($standardInputs['inputChanges']))
? $standardInputs['inputChanges'] : null ) );
+ $text .= Html::rawElement( 'label', array( 'for' =>
'sf_fi_changes' ), 'Changes input' );
+ $text .= " </span>";
+ // Cancel
+ $text .= '<span>';
+ $text .= Html::input( 'sf_fi_cancel', '1', 'checkbox', array(
'id' => 'sf_fi_cancel', 'checked' => (isset($standardInputs['inputCancel'])) ?
$standardInputs['inputCancel'] : null ) );
+ $text .= Html::rawElement( 'label', array( 'for' =>
'sf_fi_cancel' ), 'Cancel input' );
+ $text .= " </span>";
+
+ $text .= "</p>";
// Separately, add Javascript for getting the checkbox to
// hide certain fields.
@@ -255,11 +388,17 @@
$fieldValues = array();
$hasExistingValues = false;
$inputType = null;
+ $inputDesc = null;
+ $inputDescTooltipMode = null;
+ $inputBeforeText = null;
if ( !is_null( $psField ) ) {
$fieldValues = $psField->getObject(
'semanticforms_FormInput' );
if ( !is_null( $fieldValues ) ) {
$hasExistingValues = true;
$inputType = PageSchemas::getValueFromObject(
$fieldValues, 'InputType' );
+ $inputDesc = PageSchemas::getValueFromObject(
$fieldValues, 'Description' );
+ $inputDescTooltipMode =
PageSchemas::getValueFromObject( $fieldValues, 'DescriptionTooltipMode' );
+ $inputBeforeText =
PageSchemas::getValueFromObject( $fieldValues, 'TextBeforeField' );
} else {
$fieldValues = array();
}
@@ -278,11 +417,18 @@
$inputTypeDropdown = Html::rawElement( 'select', array( 'name'
=> 'sf_input_type_num' ), $inputTypeDropdownHTML );
$text = '<p>' . wfMessage( 'sf-pageschemas-inputtype'
)->escaped() . ' ' . $inputTypeDropdown . '</p>';
+ $inputBeforeTextPrint = Html::input( 'sf_input_befo_num',
$inputBeforeText, 'text', array( 'size' => 80 ) );
+ $text .= "\t<p>Enter the text that will be printed before the
field:</p>\t<p>$inputBeforeTextPrint</p>\n";
+
+ $inputDescription = Html::input( 'sf_input_desc_num',
$inputDesc, 'text', array( 'size' => 80 ) );
+ $inputDescriptionTooltipMode = Html::input(
'sf_input_desctool_num', $inputDescTooltipMode, 'checkbox', array( 'checked' =>
($inputDescTooltipMode) ? 'checked' : null ) );
+ $text .= "\t<p>Enter field
<b>description</b>:</p>\t<p>$inputDescription<br>$inputDescriptionTooltipMode
Show description as pop-up tooltip</p>\n";
+
// @todo FIXME: i18n issue: Hard coded text.
$text .= "\t" . '<p>Enter parameter names and their values as
key=value pairs, separated by commas (if a value contains a comma, replace it
with "\,"). For example: size=20, mandatory</p>' . "\n";
$paramValues = array();
foreach ( $fieldValues as $param => $value ) {
- if ( !empty( $param ) && $param != 'InputType' ) {
+ if ( !empty( $param ) && $param != 'InputType' &&
$param != 'Description' && $param != 'DescriptionTooltipMode' && $param !=
'TextBeforeField' ) {
if ( !empty( $value ) ) {
$paramValues[] = $param . '=' . $value;
} else {
@@ -322,7 +468,13 @@
$formName = (string)$child->attributes()->name;
$sfarray['name'] = $formName;
foreach ( $child->children() as $tag =>
$formelem ) {
- $sfarray[$tag] = (string)$formelem;
+ if($tag == "standardInputs") {
+ foreach (
$formelem->attributes() as $attr => $value ) {
+ $sfarray[$attr] =
(string)$formelem->attributes()->$attr;
+ }
+ }else{
+ $sfarray[$tag] =
(string)$formelem;
+ }
}
return $sfarray;
}
@@ -384,6 +536,8 @@
$templateFields = array();
foreach ( $psFields as $psField ) {
$prop_array = $psField->getObject(
'semanticmediawiki_Property' );
+ $field_options = array();
+ wfRunHooks( 'SfFieldsFromTemplateSchema', array(
$psField, &$field_options ));
$propertyName = PageSchemas::getValueFromObject(
$prop_array, 'name' );
if ( !is_null( $prop_array ) && empty( $propertyName )
) {
$propertyName = $psField->getName();
@@ -399,7 +553,8 @@
$propertyName,
$psField->isList(),
$psField->getDelimiter(),
- $psField->getDisplay()
+ $psField->getDisplay(),
+ $field_options
);
$templateFields[] = $templateField;
}
@@ -414,6 +569,28 @@
$formTemplates, $formDataFromSchema, $categoryName ) {
global $wgUser;
+ $input = array();
+ if ( array_key_exists( 'inputFreeText', $formDataFromSchema ) )
+ $input['free text'] = '{{{standard input|free
text|rows=10}}}';
+ if ( array_key_exists( 'inputSummary', $formDataFromSchema ) )
+ $input['summary'] = '{{{standard input|summary}}}';
+ if ( array_key_exists( 'inputMinorEdit', $formDataFromSchema ) )
+ $input['minor edit'] = '{{{standard input|minor
edit}}}';
+ if ( array_key_exists( 'inputWatch', $formDataFromSchema ) )
+ $input['watch'] = '{{{standard input|watch}}}';
+ if ( array_key_exists( 'inputSave', $formDataFromSchema ) )
+ $input['save'] = '{{{standard input|save}}}';
+ if ( array_key_exists( 'inputPreview', $formDataFromSchema ) )
+ $input['preview'] = '{{{standard input|preview}}}';
+ if ( array_key_exists( 'inputChanges', $formDataFromSchema ) )
+ $input['changes'] = '{{{standard input|changes}}}';
+ if ( array_key_exists( 'inputCancel', $formDataFromSchema ) )
+ $input['cancel'] = '{{{standard input|cancel}}}';
+
+ $freeTextLabel = null;
+ if ( array_key_exists( 'freeTextLabel', $formDataFromSchema ) )
+ $freeTextLabel = $formDataFromSchema['freeTextLabel'];
+
$form = SFForm::create( $formName, $formTemplates );
$form->setAssociatedCategory( $categoryName );
if ( array_key_exists( 'PageNameFormula', $formDataFromSchema )
) {
@@ -425,7 +602,7 @@
if ( array_key_exists( 'EditTitle', $formDataFromSchema ) ) {
$form->setEditTitle( $formDataFromSchema['EditTitle'] );
}
- $formContents = $form->createMarkup();
+ $formContents = $form->createMarkup( $input, $freeTextLabel );
$params = array();
$params['user_id'] = $wgUser->getId();
$params['page_text'] = $formContents;
@@ -456,6 +633,8 @@
} else {
$internalObjProperty = null;
}
+ $template_options = array();
+ wfRunHooks('SfTemplateOptions', array( $psTemplate,
&$template_options ) );
// TODO - actually, the category-setting should be
// smarter than this: if there's more than one
// template in the schema, it should probably be only
@@ -473,7 +652,7 @@
}
$templateText = SFTemplateField::createTemplateText(
$templateName,
$template_fields, $internalObjProperty,
$categoryName,
- null, null, $templateFormat );
+ null, null, $templateFormat, $template_options
);
if ( in_array( $fullTemplateName, $selectedPages ) ) {
$params = array();
$params['user_id'] = $wgUser->getId();
diff --git a/includes/SF_TemplateField.php b/includes/SF_TemplateField.php
index 7f3b442..15ff8ac 100644
--- a/includes/SF_TemplateField.php
+++ b/includes/SF_TemplateField.php
@@ -20,8 +20,9 @@
private $mDelimiter;
private $mDisplay;
private $mInputType;
+ private $mOptions;
- static function create( $name, $label, $semanticProperty = null,
$isList = null, $delimiter = null, $display = null ) {
+ static function create( $name, $label, $semanticProperty = null,
$isList = null, $delimiter = null, $display = null, $field_options = null ) {
$f = new SFTemplateField();
$f->mFieldName = trim( str_replace( '\\', '', $name ) );
$f->mLabel = trim( str_replace( '\\', '', $label ) );
@@ -29,6 +30,7 @@
$f->mIsList = $isList;
$f->mDelimiter = $delimiter;
$f->mDisplay = $display;
+ $f->mOptions = $field_options;
// Delimiter should default to ','.
if ( $isList && !$delimiter ) {
$f->mDelimiter = ',';
@@ -157,7 +159,8 @@
* @TODO: There's really no good reason why this method is contained
* within this class.
*/
- public static function createTemplateText( $template_name,
$template_fields, $internal_obj_property, $category, $aggregating_property,
$aggregating_label, $template_format ) {
+ public static function createTemplateText( $template_name,
$template_fields, $internal_obj_property, $category,
+
$aggregating_property, $aggregating_label, $template_format,
$template_options = null ) {
$template_header = wfMessage( 'sf_template_docu',
$template_name )->inContentLanguage()->text();
$text = <<<END
<noinclude>
@@ -178,6 +181,12 @@
$template_footer
</noinclude><includeonly>
END;
+
+ //Before text
+ if ( isset($template_options['beforeText']) ) {
+ $text .= $template_options['beforeText']."\n";
+ }
+
// Only add a call to #set_internal if the Semantic Internal
// Objects extension is also installed.
if ( $internal_obj_property && class_exists(
'SIOInternalObject' ) ) {
@@ -207,6 +216,22 @@
foreach ( $template_fields as $i => $field ) {
if ( $field->mFieldName == '' ) continue;
+ $separator = '|';
+
+ $fieldBefore = '';
+ $fieldAfter = '';
+
+ $fieldOptions = $field->getOptions();
+
+ if ( isset($fieldOptions['textBefore']) && ( $field !==
null ) ) {
+ $fieldBefore = $fieldOptions['textBefore'];
+ //wfRunHooks('SfTemplateFieldBefore', array(
$field, &$fieldBefore ) );
+ }
+ if ( isset($fieldOptions['textAfter']) && ( $field !==
null ) ) {
+ $fieldAfter = $fieldOptions['textAfter'];
+ //wfRunHooks('SfTemplateFieldAfter', array(
$field, &$fieldAfter ) );
+ }
+
if ( $field->mLabel == '' ) {
$field->mLabel = $field->mFieldName;
}
@@ -226,9 +251,10 @@
$tableText .= '{{#if:{{{' . $field->mFieldName
. '|}}}|';
if ( $template_format == 'standard' ||
$template_format == 'infobox' ) {
if ( $i > 0 ) {
- $tableText .= "{{!}}-\n";
+ $tableText .= "\n{{!}}-\n";
}
$tableText .= '! ' . $field->mLabel .
"\n";
+ $separator = '{{!}}';
} elseif ( $template_format == 'plain' ) {
$tableText .= "'''" . $field->mLabel .
"''' ";
} elseif ( $template_format == 'sections' ) {
@@ -245,13 +271,13 @@
}
}
if ( !$field->mSemanticProperty ) {
- $tableText .= "{{{" . $field->mFieldName .
"|}}}";
+ $tableText .= "$separator $fieldBefore {{{" .
$field->mFieldName . "|}}} $fieldAfter\n";
if ( $field->mDisplay == 'nonempty' ) {
$tableText .= " }}";
}
$tableText .= "\n";
} elseif ( !is_null( $setInternalText ) ) {
- $tableText .= "{{{" . $field->mFieldName .
"|}}}\n";
+ $tableText .= "$separator $fieldBefore {{{" .
$field->mFieldName . "|}}} $fieldAfter\n";
if ( $field->mIsList ) {
$setInternalText .= '|' .
$field->mSemanticProperty . '#list={{{' . $field->mFieldName . '|}}}';
} else {
@@ -264,7 +290,7 @@
$setText .= $field->mSemanticProperty .
'={{{' . $field->mFieldName . '|}}}|';
}
} elseif ( $field->mDisplay == 'nonempty' ) {
- $tableText .= '[[' . $field->mSemanticProperty
. '::{{{' . $field->mFieldName . "|}}}]]}}\n";
+ $tableText .= '{{!}} ' . $fieldBefore . ' [[' .
$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
@@ -284,7 +310,7 @@
}
$tableText .= "{{#arraymap:{{{" .
$field->mFieldName . "|}}}|" . $field->mDelimiter . "|$var|[[" .
$field->mSemanticProperty . "::$var]]}}\n";
} else {
- $tableText .= "[[" . $field->mSemanticProperty
. "::{{{" . $field->mFieldName . "|}}}]]\n";
+ $tableText .= "" . $fieldBefore . " [[" .
$field->mSemanticProperty . "::{{{" . $field->mFieldName . "|}}}]]
$fieldAfter\n";
}
}
@@ -328,14 +354,24 @@
}
$text .= $tableText;
- if ( $category !== '' ) {
+ if ( ( $category !== '' ) && ( $category !== null ) ) {
global $wgContLang;
$namespace_labels = $wgContLang->getNamespaces();
$category_namespace = $namespace_labels[NS_CATEGORY];
$text .= "\n[[$category_namespace:$category]]\n";
}
+
+ //After text
+ if ( isset($template_options['afterText']) ) {
+ $text .= $template_options['afterText'];
+ }
+
$text .= "</includeonly>\n";
return $text;
}
+
+ public function getOptions() {
+ return $this->mOptions;
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/53864
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I10276b51c5fc755efb6ffce6390de47aac10cdc7
Gerrit-PatchSet: 10
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Vedmaka Wakalaka <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: Vedmaka Wakalaka <[email protected]>
Gerrit-Reviewer: Yaron Koren <[email protected]>
Gerrit-Reviewer: Yury Katkov <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
