ENH Update code to reflect changes in template layer #1334
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Closed
23 tasks
GuySartorelli
force-pushed
the
pulls/7/refactor-template-layer
branch
from
80112d7
to
dc84a23
Compare
GuySartorelli
force-pushed
the
pulls/7/refactor-template-layer
branch
from
dc84a23
to
06cd3ee
Compare
GuySartorelli
force-pushed
the
pulls/7/refactor-template-layer
branch
from
06cd3ee
to
5e315a1
Compare
GuySartorelli
commented
Oct 23, 2024
Comment on lines
-424
to
+426
| $emailData['Body'] = SSViewer::execute_string($recipient->getEmailBodyContent(), $mergeFields); | ||
| $engine = Injector::inst()->create(TemplateEngine::class); | ||
| $emailData['Body'] = $engine->renderString($recipient->getEmailBodyContent(), ViewLayerData::create($mergeFields)); |
There was a problem hiding this comment.
The "EmailBodyContent" is a string that represents a template. It's defined by content authors. By default it should be ss template syntax and the ss template renderer will be used - but it could be twig or whatever-the-heck else so I've decided to fetch whatever's registered under TemplateEngine instead of explicitly instantiating SSTemplateEngine here.
GuySartorelli
commented
Oct 23, 2024
| @@ -562,7 +568,7 @@ public function getEmailTemplateDropdownValues() | |||
| $templates = []; | |||
|
|
|||
| $finder = new FileFinder(); | |||
| $finder->setOption('name_regex', '/^.*\.ss$/'); | |||
| $finder->setOption('name_regex', static::config()->get('email_template_regex')); | |||
There was a problem hiding this comment.
Made configurable so if someone wants to swap out to a different rendering engine they can update this to /^.*\.twig$/ or whatever.
Really this whole thing should just use the regular template/ dir and let the regular template lookup process occur - but changing that is out of scope.
emteknetnz
approved these changes
Oct 30, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Relies and reflects on changes in silverstripe/silverstripe-framework#11405
Issue