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 #852 from LukeAmos/issue/814 

FIX Fixes #814 Renamed 'SubmittedFormEmailHtml' to 'SubmittedFormEmail'
This commit is contained in:
Robbie Averill 2019-01-16 22:55:50 +01:00 committed by GitHub
parent b2101c15fc 1efeeca6db
commit 1ad1019e0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/Control/UserDefinedFormController.php
View File

@ -290,7 +290,7 @@ JS
if ($recipients = $this->FilteredEmailRecipients($data, $form)) {
foreach ($recipients as $recipient) {
$email = Email::create()
->setHTMLTemplate('email/SubmittedFormEmailHtml')
->setHTMLTemplate('email/SubmittedFormEmail')
->setPlainTemplate('email/SubmittedFormEmailPlain');
// 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
View File

4
tests/Model/UserDefinedFormTest.php
View File

@ -175,8 +175,8 @@ class UserDefinedFormTest extends FunctionalTest
$result = $recipient->getEmailTemplateDropdownValues();
// Installation path can be as a project when testing in Travis, so check partial match
$this->assertContains('email' . DIRECTORY_SEPARATOR . 'SubmittedFormEmailHtml', key($result));
$this->assertSame('SubmittedFormEmailHtml', current($result));
$this->assertContains('email' . DIRECTORY_SEPARATOR . 'SubmittedFormEmail', key($result));
$this->assertSame('SubmittedFormEmail', current($result));
}
public function testEmailTemplateExists()