tonyair
/
silverstripe-userforms
mirror of https://github.com/silverstripe/silverstripe-userforms.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1040 from creative-commoners/pulls/5.8/email-preview 

FIX Show correct fields in email preview
This commit is contained in:
Andre Kiste 2021-05-03 15:25:18 +12:00 committed by GitHub
parent d8ab74247c 8801790b66
commit 6b94f9b791
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/Model/Recipient/UserFormRecipientItemRequest.php
View File

@ -53,16 +53,12 @@ class UserFormRecipientItemRequest extends GridFieldDetailForm_ItemRequest
protected function getPreviewFieldData()
{
$data = ArrayList::create();
$fields = $this->record->Form()->Fields()->filter(
'ClassName:not',
[
EditableLiteralField::class,
EditableFormHeading::class,
]
);
$fields = $this->record->Form()->Fields();
foreach ($fields as $field) {
if (!$field->showInReports()) {
continue;
}
$data->push(ArrayData::create([
'Name' => $field->dbObject('Name'),
'Title' => $field->dbObject('Title'),

47
tests/Model/Recipient/UserFormRecipientItemRequestTest.php Normal file
View File

@ -0,0 +1,47 @@
<?php
namespace SilverStripe\UserForms\Tests\Model\Recipient;
use SilverStripe\Dev\SapphireTest;
use SilverStripe\ORM\PolymorphicHasManyList;
use SilverStripe\UserForms\Model\Recipient\EmailRecipient;
use SilverStripe\UserForms\Model\Recipient\UserFormRecipientItemRequest;
use SilverStripe\UserForms\Model\UserDefinedForm;
class UserFormRecipientItemRequestTest extends SapphireTest
{
public function testShowInReportsAffectsPreview()
{
// classes where showInReports() returns false
$namespace = 'SilverStripe\UserForms\Model\EditableFormField';
$falseClasses = ['EditableFieldGroup', 'EditableFieldGroupEnd', 'EditableFormStep'];
// some classes where showInReports() returns true (inherits from EditableFormField)
$trueClasses = ['EditableTextField', 'EditableEmailField', 'EditableDateField'];
$form = new UserDefinedForm();
$form->write();
/** @var PolymorphicHasManyList $fields */
$fields = $form->Fields();
foreach (array_merge($falseClasses, $trueClasses) as $class) {
$fqcn = "$namespace\\$class";
$obj = new $fqcn();
$obj->Name = 'My' . $class;
$obj->write();
$fields->add($obj);
}
$recipient = new EmailRecipient();
$recipient->EmailAddress = 'to@example.com';
$recipient->EmailFrom = 'from@example.com';
$recipient->EmailTemplate = 'email/SubmittedFormEmail';
$recipient->Form = $form;
$recipient->write();
$recipient->setComponent('Form', $form);
$request = new UserFormRecipientItemRequest(null, null, $recipient, null, '');
$html = $request->preview()->getValue();
foreach ($falseClasses as $class) {
$this->assertNotContains('My' . $class, $html);
}
foreach ($trueClasses as $class) {
$this->assertContains('My' . $class, $html);
}
}
}