From ccd0eb1fc47a8644c27808852a3969b190b58e7e Mon Sep 17 00:00:00 2001
From: Yorkie Chadwick <ychadwick@gmail.com>
Date: Fri, 30 Oct 2020 12:48:17 +0100
Subject: [PATCH] Update PageManager.php

ensure that new entities are persisted if the object is created as a fall back
---
 src/Entity/PageManager.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Entity/PageManager.php b/src/Entity/PageManager.php
index 9c0e6b8fc..b50588955 100644
--- a/src/Entity/PageManager.php
+++ b/src/Entity/PageManager.php
@@ -192,6 +192,8 @@ public function revertToPublished(PageInterface $draftPage, \JMS\Serializer\Seri
 
         $publishedPage->setContentRoute($contentRoute);
 
+        $this->_em->flush();
+
         // Set the layout blocks of the NOW managed entity to
         // exactly that of the published version
 	    foreach ($tmpLayoutBlocks as $key => $layoutBlock){
@@ -200,6 +202,8 @@ public function revertToPublished(PageInterface $draftPage, \JMS\Serializer\Seri
 			    $layoutBlock = $this->_em->merge($layoutBlock);
 		    }catch (EntityNotFoundException $e){
 		    	$layoutBlock = clone $layoutBlock;
+
+		    	$layoutBlock->setPage($publishedPage);
 		    	$this->_em->persist($layoutBlock);
 		    }
 
@@ -207,8 +211,8 @@ public function revertToPublished(PageInterface $draftPage, \JMS\Serializer\Seri
 
 		    $tmpLayoutBlocks->set($key, $layoutBlock);
 	    }
+        $publishedPage->resetLayoutBlock($tmpLayoutBlocks);
 
-	    $publishedPage->resetLayoutBlock($tmpLayoutBlocks);
 	    $this->_em->persist($publishedPage);
         $this->_em->flush();
 
@@ -228,8 +232,6 @@ public function resetContent(PageInterface $page, LayoutBlock $layoutBlock, \JMS
 	    if ($contentObject = $layoutBlock->getSnapshotContent()) {
 		    $contentObject = $serializer->deserialize($contentObject, $layoutBlock->getClassType(), 'json');
 
-
-
 		    try {
 			    $contentObject = $this->_em->merge($contentObject);
 			    $reflection = new \ReflectionClass($contentObject);
@@ -267,9 +269,13 @@ public function resetContent(PageInterface $page, LayoutBlock $layoutBlock, \JMS
 				    if ($reflection->hasMethod($method) && $var = $contentObject->{$method}()) {
 					    if ($var instanceof ArrayCollection) {
 						    foreach ($var as $key =>  $v) {
-							    $v = $this->_em->merge($v);
-
-							    $var->set($key, $v);
+							    try{
+                                    $v = $this->_em->merge($v);
+                                    $var->set($key, $v);
+                                }catch(EntityNotFoundException $e){
+							        $this->_em->persist($v);
+                                    $var->set($key, $v);
+                                }
 						    }
 						    $method = sprintf('set%s', ucfirst($property->getName()));
 						    $newContentObject->{$method}($var);