[BUGFIX] EXT:form - Handle values of CHECKBOX and RADIO correctly 20/48720/5
authorGianluigi Martino <gmartino27@gmail.com>
Mon, 4 Jul 2016 16:54:08 +0000 (18:54 +0200)
committerWouter Wolters <typo3@wouterwolters.nl>
Wed, 6 Jul 2016 16:51:49 +0000 (18:51 +0200)
Show values of CHECKBOX and RADIO elements on confirmation page.
Send values in HTML and plain text mails.

Change-Id: I59e6ed255d70902567812a9f7d9c6550c72f5a2d
Resolves: #76866
Releases: master, 7.6
Reviewed-on: https://review.typo3.org/48720
Tested-by: Bamboo TYPO3com <info@typo3.com>
Reviewed-by: Bjoern Jacob <bjoern.jacob@tritum.de>
Tested-by: Bjoern Jacob <bjoern.jacob@tritum.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
typo3/sysext/form/Resources/Private/Partials/Default/Confirmation/FlatElements/Checkbox.html
typo3/sysext/form/Resources/Private/Partials/Default/Confirmation/FlatElements/Radio.html
typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Html/FlatElements/Checkbox.html
typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Html/FlatElements/Radio.html
typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Plain/FlatElements/Checkbox.html
typo3/sysext/form/Resources/Private/Partials/Default/PostProcessor/Mail/Plain/FlatElements/Radio.html

index 65fe3e8..734eb44 100644 (file)
@@ -2,6 +2,7 @@
        <f:if condition="{model.additionalArguments.checked} == 'checked'">
                <li class="csc-form-{model.elementCounter} csc-form-element csc-form-element-{model.elementTypeLowerCase}">
                        {f:render(partial: '{themeName}/Confirmation/AdditionalElements/Label', arguments: {model: model, themeName: themeName})}
+                       <f:if condition="{model.additionalArguments.value}">{model.additionalArguments.value}</f:if>
                </li>
        </f:if>
 </f:if>
index fdc36ab..0667ba9 100644 (file)
@@ -2,6 +2,7 @@
        <f:if condition="{model.additionalArguments.checked} == 'checked'">
                <li class="csc-form-{model.elementCounter} csc-form-element csc-form-element-{model.elementTypeLowerCase}">
                        {f:render(partial: '{themeName}/Confirmation/AdditionalElements/Label', arguments: {model: model, themeName: themeName})}
+                       <f:if condition="{model.additionalArguments.value}">{model.additionalArguments.value}</f:if>
                </li>
        </f:if>
 </f:if>
index 77dcb26..73e16d8 100644 (file)
@@ -4,6 +4,7 @@
   <td style="width: 200px;">
     {f:render(partial: 'AdditionalElements/Label', arguments: {model: model})}
   </td>
+  <td>{model.additionalArguments.value}</td>
 </tr>
 </f:if>
 </f:if>
\ No newline at end of file
index 6667a15..29119c7 100644 (file)
@@ -1 +1 @@
-{namespace form=TYPO3\CMS\Form\ViewHelpers}<f:if condition="{model.showElement}"><f:if condition="{model.additionalArguments.checked} == 'checked'"><form:plainMail labelContent="{model}" /></f:if></f:if>
+{namespace form=TYPO3\CMS\Form\ViewHelpers}<f:if condition="{model.showElement}"><f:if condition="{model.additionalArguments.checked} == 'checked'"><form:plainMail labelContent="{model}" content="{model.additionalArguments.value}" /></f:if></f:if>
index 051749e..73e0941 100644 (file)
@@ -1,2 +1,2 @@
-{namespace form=TYPO3\CMS\Form\ViewHelpers}<f:if condition="{model.showElement}"><f:if condition="{model.additionalArguments.checked} == 'checked'"><form:plainMail labelContent="{model}" />
+{namespace form=TYPO3\CMS\Form\ViewHelpers}<f:if condition="{model.showElement}"><f:if condition="{model.additionalArguments.checked} == 'checked'"><form:plainMail labelContent="{model}" content="{model.additionalArguments.value}" />
 </f:if></f:if>
\ No newline at end of file