mirror of
https://github.com/silverstripe/silverstripe-userforms.git
synced 2024-10-22 17:05:42 +02:00
FIX Fixes #814 Renamed 'SubmittedFormEmailHtml' to 'SubmittedFormEmail'
following peer feedback. Updated respective code and unit test
This commit is contained in:
parent
2cb649abbb
commit
1efeeca6db
@ -290,7 +290,7 @@ JS
|
|||||||
if ($recipients = $this->FilteredEmailRecipients($data, $form)) {
|
if ($recipients = $this->FilteredEmailRecipients($data, $form)) {
|
||||||
foreach ($recipients as $recipient) {
|
foreach ($recipients as $recipient) {
|
||||||
$email = Email::create()
|
$email = Email::create()
|
||||||
->setHTMLTemplate('email/SubmittedFormEmailHtml')
|
->setHTMLTemplate('email/SubmittedFormEmail')
|
||||||
->setPlainTemplate('email/SubmittedFormEmailPlain');
|
->setPlainTemplate('email/SubmittedFormEmailPlain');
|
||||||
|
|
||||||
// Merge fields are used for CMS authors to reference specific form fields in email content
|
// Merge fields are used for CMS authors to reference specific form fields in email content
|
||||||
|
0
templates/email/SubmittedFormEmailHtml.ss → templates/email/SubmittedFormEmail.ss
Executable file → Normal file
0
templates/email/SubmittedFormEmailHtml.ss → templates/email/SubmittedFormEmail.ss
Executable file → Normal file
@ -175,8 +175,8 @@ class UserDefinedFormTest extends FunctionalTest
|
|||||||
$result = $recipient->getEmailTemplateDropdownValues();
|
$result = $recipient->getEmailTemplateDropdownValues();
|
||||||
|
|
||||||
// Installation path can be as a project when testing in Travis, so check partial match
|
// Installation path can be as a project when testing in Travis, so check partial match
|
||||||
$this->assertContains('email' . DIRECTORY_SEPARATOR . 'SubmittedFormEmailHtml', key($result));
|
$this->assertContains('email' . DIRECTORY_SEPARATOR . 'SubmittedFormEmail', key($result));
|
||||||
$this->assertSame('SubmittedFormEmailHtml', current($result));
|
$this->assertSame('SubmittedFormEmail', current($result));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testEmailTemplateExists()
|
public function testEmailTemplateExists()
|
||||||
|
Loading…
Reference in New Issue
Block a user