Exchange: layouts added from exchange should not have the imported ta…

…g, because they are applied templates and the parent tags win. (#2664) fixes xibosignageltd/xibo-private#811
xibosignage · Aug 1, 2024 · c1d1793 · c1d1793
1 parent ca0dfe5
commit c1d1793
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/lib/Controller/Layout.php b/lib/Controller/Layout.php
@@ -879,7 +879,8 @@ public function applyTemplate(Request $request, Response $response, $id): Respon
                 $this->getDataSetFactory(),
                 '',
                 $this->mediaService,
-                $layout->folderId
+                $layout->folderId,
+                false,
             );
 
             $template->managePlaylistClosureTable();

diff --git a/lib/Factory/LayoutFactory.php b/lib/Factory/LayoutFactory.php
@@ -36,7 +36,6 @@
 use Xibo\Helper\DateFormatHelper;
 use Xibo\Service\ConfigServiceInterface;
 use Xibo\Service\MediaServiceInterface;
-use Xibo\Support\Exception\ConfigurationException;
 use Xibo\Support\Exception\DuplicateEntityException;
 use Xibo\Support\Exception\GeneralException;
 use Xibo\Support\Exception\InvalidArgumentException;
@@ -1252,7 +1251,7 @@ public function loadByJson($layoutJson, $playlistJson, $nestedPlaylistJson, Fold
      * @param string $zipFile
      * @param string $layoutName
      * @param int $userId
-     * @param int $template
+     * @param int $template Are we importing a layout to be used as a template?
      * @param int $replaceExisting
      * @param int $importTags
      * @param bool $useExistingDataSets
@@ -1261,12 +1260,10 @@ public function loadByJson($layoutJson, $playlistJson, $nestedPlaylistJson, Fold
      * @param string $tags
      * @param MediaServiceInterface $mediaService
      * @param int $folderId
+     * @param bool $isSystemTags Should we add the system tags (currently the "imported" tag)
      * @return Layout
-     * @throws DuplicateEntityException
-     * @throws GeneralException
-     * @throws InvalidArgumentException
-     * @throws NotFoundException
-     * @throws ConfigurationException
+     * @throws \FontLib\Exception\FontNotFoundException
+     * @throws \Xibo\Support\Exception\GeneralException
      */
     public function createFromZip(
         $zipFile,
@@ -1280,7 +1277,8 @@ public function createFromZip(
         $dataSetFactory,
         $tags,
         MediaServiceInterface $mediaService,
-        int $folderId
+        int $folderId,
+        bool $isSystemTags = true,
     ) {
         $this->getLog()->debug(sprintf(
             'Create Layout from ZIP File: %s, imported name will be %s.',
@@ -1433,8 +1431,11 @@ public function createFromZip(
             $layout->assignTag($this->tagFactory->tagFromString('template'));
         }
 
-        // Tag as imported
-        $layout->assignTag($this->tagFactory->tagFromString('imported'));
+        // Add system tags?
+        if ($isSystemTags) {
+            // Tag as imported
+            $layout->assignTag($this->tagFactory->tagFromString('imported'));
+        }
 
         // Tag from the upload form
         $tagsFromForm = (($tags != '') ? $this->tagFactory->tagsFromString($tags) : []);