Prevent Layout status from building a Layout when Layout Publish tran…

…saction in active

fixes xibosignage/xibo#2404

(cherry picked from commit 0ece54c)

lib/Controller/Layout.php

@@ -2583,7 +2583,7 @@ public function publish(Request $request, Response $response, $id)
 
             // We also build the XLF at this point, and if we have a problem we prevent publishing and raise as an
             // error message
-            $draft->xlfToDisk(['notify' => true, 'exceptionOnError' => true, 'exceptionOnEmptyRegion' => false]);
+            $draft->xlfToDisk(['notify' => true, 'exceptionOnError' => true, 'exceptionOnEmptyRegion' => false, 'publishing' => true]);
 
             // Return
             $this->getState()->hydrate([

lib/Entity/Layout.php

@@ -1896,12 +1896,13 @@ public function xlfToDisk($options = [])
             'notify' => true,
             'collectNow' => true,
             'exceptionOnError' => false,
-            'exceptionOnEmptyRegion' => true
+            'exceptionOnEmptyRegion' => true,
+            'publishing' => false
         ], $options);
 
         $path = $this->getCachePath();
 
-        if ($this->status == 3 || !file_exists($path)) {
+        if ($this->status == 3 || !file_exists($path) || ($options['publishing'] && $this->status == 5) ) {
 
             $this->getLog()->debug('XLF needs building for Layout ' . $this->layoutId);
 
@@ -2012,6 +2013,11 @@ public function publishDraft()
         // Get my parent for later
         $parent = $this->layoutFactory->loadById($this->parentId);
 
+        $this->getStore()->isolated('UPDATE `layout` SET status = 5 WHERE layoutId = :layoutId', [
+            'layoutId' => $this->layoutId
+        ]);
+        $this->getStore()->commitIfNecessary('isolated');
+
         // I am the draft, so I clear my parentId, and set the parentId of my parent, to myself (swapping us)
         // Make me the parent.
         $this->getStore()->update('UPDATE `layout` SET parentId = NULL WHERE layoutId = :layoutId', [
@@ -2091,7 +2097,7 @@ public function publishDraft()
             'saveLayout' => true,
             'saveRegions' => false,
             'saveTags' => false,
-            'setBuildRequired' => true,
+            'setBuildRequired' => false,
             'validate' => false,
             'audit' => true,
             'notify' => false