Merge pull request #61 from bwaidelich/feature-emailfinisher-template…

…source FEATURE: Allow the EmailFinisher template source to be set
neos · Aug 29, 2017 · 489d4ff · 489d4ff
2 parents 5bd9730 + d8aa3e5
commit 489d4ff
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/Classes/Finishers/EmailFinisher.php b/Classes/Finishers/EmailFinisher.php
@@ -23,7 +23,8 @@
  *
  * Options:
  *
- * - templatePathAndFilename (mandatory): Template path and filename for the mail body
+ * - templatePathAndFilename (mandatory if "templateSource" option is not set): Template path and filename for the mail body
+ * - templateSource (mandatory if "templatePathAndFilename" option is not set): The raw Fluid template
  * - layoutRootPath: root path for the layouts
  * - partialRootPath: root path for the partials
  * - variables: associative array of variables which are available inside the Fluid template
@@ -163,10 +164,14 @@ protected function executeInternal()
     protected function initializeStandaloneView()
     {
         $standaloneView = new StandaloneView();
-        if (!isset($this->options['templatePathAndFilename'])) {
-            throw new FinisherException('The option "templatePathAndFilename" must be set for the EmailFinisher.', 1327058829);
+        if (isset($this->options['templatePathAndFilename'])) {
+            $standaloneView->setTemplatePathAndFilename($this->options['templatePathAndFilename']);
+        } elseif (isset($this->options['templateSource'])) {
+            $standaloneView->setTemplateSource($this->options['templateSource']);
+        } else {
+            throw new FinisherException('The option "templatePathAndFilename" or "templateSource" must be set for the EmailFinisher.', 1327058829);
         }
-        $standaloneView->setTemplatePathAndFilename($this->options['templatePathAndFilename']);
+
 
         if (isset($this->options['partialRootPath'])) {
             $standaloneView->setPartialRootPath($this->options['partialRootPath']);
@@ -176,6 +181,8 @@ protected function initializeStandaloneView()
             $standaloneView->setLayoutRootPath($this->options['layoutRootPath']);
         }
 
+        $standaloneView->assign('formValues', $this->finisherContext->getFormValues());
+
         if (isset($this->options['variables'])) {
             $standaloneView->assignMultiple($this->options['variables']);
         }

diff --git a/Documentation/configuring-form-yaml.rst b/Documentation/configuring-form-yaml.rst
@@ -89,6 +89,9 @@ The following YAML is stored as ``contact.yaml``:
           senderName: '{name}'
           format: plaintext
 
+.. note:: Instead of setting the ``templatePathAndFilename`` option to specify the Fluid template file for the EmailFinisher,
+          the template source can also be set directly via the ``templateSource`` option.
+
 
 File Uploads
 ------------