Fix: Allow Email to re-render when data changes

silverstripe · Mar 1, 2021 · c43789c · c43789c
1 parent 2c54a3f
commit c43789c
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 0 deletions.
diff --git a/src/Control/Email/Email.php b/src/Control/Email/Email.php
@@ -570,6 +570,7 @@ public function getData()
     public function setData($data)
     {
         $this->data = $data;
+        $this->setBody(null);
 
         return $this;
     }
@@ -589,6 +590,8 @@ public function addData($name, $value = null)
             $this->data->$name = $value;
         }
 
+        $this->setBody(null);
+
         return $this;
     }
 
@@ -606,6 +609,8 @@ public function removeData($name)
             $this->data->$name = null;
         }
 
+        $this->setBody(null);
+
         return $this;
     }
 

diff --git a/tests/php/Control/Email/EmailTest.php b/tests/php/Control/Email/EmailTest.php
@@ -559,6 +559,39 @@ public function testRenderAgain()
         $this->assertCount(1, $email->getSwiftMessage()->getChildren());
     }
 
+    public function testRerender()
+    {
+        $email = new Email();
+        $email->setData([
+            'EmailContent' => 'my content',
+        ]);
+        $email->render();
+        $this->assertContains('my content', $email->getBody());
+        $children = $email->getSwiftMessage()->getChildren();
+        $this->assertCount(1, $children);
+        $plainPart = reset($children);
+        $this->assertEquals('my content', $plainPart->getBody());
+
+        // Ensure setting data causes a rerender
+        $email->setData([
+            'EmailContent' => 'your content'
+        ]);
+        $email->render();
+        $this->assertContains('your content', $email->getBody());
+
+        // Ensure removing data causes a rerender
+        $email->removeData('EmailContent');
+        $email->render();
+        $this->assertNotContains('your content', $email->getBody());
+
+        // Ensure adding data causes a rerender
+        $email->addData([
+            'EmailContent' => 'their content'
+        ]);
+        $email->render();
+        $this->assertContains('their content', $email->getBody());
+    }
+
     public function testRenderPlainOnly()
     {
         $email = new Email();