Yaron Koren has submitted this change and it was merged.

Change subject: Fix for generating a template field if no property and 
"display-if-not-empty"
......................................................................


Fix for generating a template field if no property and "display-if-not-empty"

Change-Id: I3b9d2a175787f8eb2356f01135daeef99c897dd8
---
M includes/SF_TemplateField.php
1 file changed, 6 insertions(+), 2 deletions(-)

Approvals:
  Yaron Koren: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/includes/SF_TemplateField.php b/includes/SF_TemplateField.php
index 1588684..7f3b442 100644
--- a/includes/SF_TemplateField.php
+++ b/includes/SF_TemplateField.php
@@ -238,14 +238,18 @@
                        // Value column
                        if ( $template_format == 'standard' || $template_format 
== 'infobox' ) {
                                if ( $field->mDisplay == 'hidden' ) {
-                               } elseif ( $field->mDisplay == 'hidden' ) {
+                               } elseif ( $field->mDisplay == 'nonempty' ) {
                                        $tableText .= "{{!}} ";
                                } else {
                                        $tableText .= "| ";
                                }
                        }
                        if ( !$field->mSemanticProperty ) {
-                               $tableText .= "{{{" . $field->mFieldName . 
"|}}}\n";
+                               $tableText .= "{{{" . $field->mFieldName . 
"|}}}";
+                               if ( $field->mDisplay == 'nonempty' ) {
+                                       $tableText .= " }}";
+                               }
+                               $tableText .= "\n";
                        } elseif ( !is_null( $setInternalText ) ) {
                                $tableText .= "{{{" . $field->mFieldName . 
"|}}}\n";
                                if ( $field->mIsList ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/50721
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3b9d2a175787f8eb2356f01135daeef99c897dd8
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

Reply via email to