tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-10-22 15:05:42 +00:00
Code Issues Projects Releases Wiki Activity

FIX Tests for email templates and whether they exist or not

Browse Source
This commit is contained in:
Robbie Averill 2017-08-24 15:29:27 +12:00
parent 298441b50b
commit faf04bff43
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
code/Model/Recipient/EmailRecipient.php
View File

@ -499,7 +499,7 @@ class EmailRecipient extends DataObject
{ {
$t = ($template ? $template : $this->EmailTemplate); $t = ($template ? $template : $this->EmailTemplate);
return in_array($t, $this->getEmailTemplateDropdownValues()); return array_key_exists($t, $this->getEmailTemplateDropdownValues());
} }
/** /**
@ -543,10 +543,13 @@ class EmailRecipient extends DataObject
strlen(BASE_PATH) + 1 strlen(BASE_PATH) + 1
); );
$defaultPrefix = 'userforms/templates/'; $defaultPrefixes = ['userforms/templates/', 'templates/'];
// Remove default userforms folder if it's provided foreach ($defaultPrefixes as $defaultPrefix) {
if (substr($templatePath, 0, strlen($defaultPrefix)) === $defaultPrefix) { // Remove default userforms folder if it's provided
$templatePath = substr($templatePath, strlen($defaultPrefix)); if (substr($templatePath, 0, strlen($defaultPrefix)) === $defaultPrefix) {
$templatePath = substr($templatePath, strlen($defaultPrefix));
break;
}
} }
$templates[$templatePath] = $template['filename']; $templates[$templatePath] = $template['filename'];
} }

2
tests/Model/UserDefinedFormTest.php
View File

@ -160,7 +160,7 @@ class UserDefinedFormTest extends FunctionalTest
{ {
$recipient = new EmailRecipient(); $recipient = new EmailRecipient();
$defaultValues = ['SubmittedFormEmail' => 'SubmittedFormEmail']; $defaultValues = ['email/SubmittedFormEmail' => 'SubmittedFormEmail'];
$this->assertEquals($recipient->getEmailTemplateDropdownValues(), $defaultValues); $this->assertEquals($recipient->getEmailTemplateDropdownValues(), $defaultValues);
} }