EZP-30899: Propagated ContentInfo::isHidden status when publishing (#…

…2779)
ezsystems · Oct 4, 2019 · 497ec7a · 497ec7a
1 parent 3b29de3
commit 497ec7a
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 9 deletions.
diff --git a/eZ/Publish/Core/MVC/Symfony/View/Builder/ContentViewBuilder.php b/eZ/Publish/Core/MVC/Symfony/View/Builder/ContentViewBuilder.php
@@ -234,7 +234,7 @@ function (Repository $repository) use ($locationId) {
 
         $request = $this->requestStack->getCurrentRequest();
         if (!$request || !$request->attributes->get(PreviewController::PREVIEW_PARAMETER_NAME, false)) {
-            if ($location->invisible) {
+            if ($location->invisible || $location->hidden) {
                 throw new HiddenLocationException($location, 'Location cannot be displayed as it is flagged as invisible.');
             }
         }

diff --git a/eZ/Publish/Core/Persistence/Legacy/Content/Mapper.php b/eZ/Publish/Core/Persistence/Legacy/Content/Mapper.php
@@ -83,6 +83,7 @@ private function createContentInfoFromCreateStruct(CreateStruct $struct, $curren
         $contentInfo->currentVersionNo = $currentVersionNo;
         $contentInfo->status = ContentInfo::STATUS_DRAFT;
         $contentInfo->isPublished = false;
+        $contentInfo->isHidden = $struct->isHidden;
 
         return $contentInfo;
     }
@@ -507,6 +508,7 @@ public function createCreateStructFromContent(Content $content)
         $struct->initialLanguageId = $this->languageHandler->loadByLanguageCode($content->versionInfo->initialLanguageCode)->id;
         $struct->mainLanguageId = $this->languageHandler->loadByLanguageCode($content->versionInfo->contentInfo->mainLanguageCode)->id;
         $struct->modified = time();
+        $struct->isHidden = $content->versionInfo->contentInfo->isHidden;
 
         foreach ($content->fields as $field) {
             $newField = clone $field;

diff --git a/eZ/Publish/Core/Repository/ContentService.php b/eZ/Publish/Core/Repository/ContentService.php
@@ -1692,11 +1692,13 @@ protected function internalPublishVersion(APIVersionInfo $versionInfo, $publicat
             $publicationDate = $currentTime;
         }
 
+        $contentInfo = $versionInfo->getContentInfo();
         $metadataUpdateStruct = new SPIMetadataUpdateStruct();
         $metadataUpdateStruct->publicationDate = $publicationDate;
         $metadataUpdateStruct->modificationDate = $currentTime;
+        $metadataUpdateStruct->isHidden = $contentInfo->isHidden;
 
-        $contentId = $versionInfo->getContentInfo()->id;
+        $contentId = $contentInfo->id;
         $spiContent = $this->persistenceHandler->contentHandler()->publish(
             $contentId,
             $versionInfo->versionNo,

diff --git a/eZ/Publish/Core/Repository/Tests/Service/Mock/ContentTest.php b/eZ/Publish/Core/Repository/Tests/Service/Mock/ContentTest.php
@@ -5483,8 +5483,14 @@ public function testCopyContent()
 
         $contentInfoMock->expects($this->any())
             ->method('__get')
-            ->with('id')
-            ->will($this->returnValue(42));
+            ->will(
+                $this->returnValueMap(
+                    [
+                        ['isHidden', true],
+                        ['id', 42],
+                    ]
+                )
+            );
         $versionInfoMock = $this->createMock(APIVersionInfo::class);
 
         $versionInfoMock->expects($this->any())
@@ -5542,7 +5548,7 @@ public function testCopyContent()
             ->will($this->returnValue($versionInfoMock));
 
         /* @var \eZ\Publish\API\Repository\Values\Content\VersionInfo $versionInfoMock */
-        $content = $this->mockPublishVersion(123456, 126666);
+        $content = $this->mockPublishVersion(123456, 126666, true);
         $locationServiceMock->expects($this->once())
             ->method('createLocation')
             ->with(
@@ -5608,8 +5614,13 @@ public function testCopyContentWithVersionInfo()
 
         $contentInfoMock->expects($this->any())
             ->method('__get')
-            ->with('id')
-            ->will($this->returnValue(42));
+            ->will(
+                $this->returnValueMap([
+                    ['isHidden', true],
+                    ['id', 42],
+                ])
+            );
+
         $versionInfoMock = $this->createMock(APIVersionInfo::class);
 
         $versionInfoMock->expects($this->any())
@@ -5665,7 +5676,7 @@ public function testCopyContentWithVersionInfo()
             ->will($this->returnValue($versionInfoMock));
 
         /* @var \eZ\Publish\API\Repository\Values\Content\VersionInfo $versionInfoMock */
-        $content = $this->mockPublishVersion(123456, 126666);
+        $content = $this->mockPublishVersion(123456, 126666, true);
         $locationServiceMock->expects($this->once())
             ->method('createLocation')
             ->with(
@@ -5862,10 +5873,11 @@ protected function mockSetDefaultObjectStates()
     /**
      * @param int|null $publicationDate
      * @param int|null $modificationDate
+     * @param bool $isHidden
      *
      * @return \eZ\Publish\API\Repository\Values\Content\Content
      */
-    protected function mockPublishVersion($publicationDate = null, $modificationDate = null)
+    protected function mockPublishVersion($publicationDate = null, $modificationDate = null, $isHidden = false)
     {
         $versionInfoMock = $this->createMock(APIVersionInfo::class);
         $contentInfoMock = $this->createMock(APIContentInfo::class);
@@ -5925,6 +5937,7 @@ protected function mockPublishVersion($publicationDate = null, $modificationDate
         // Account for 1 second of test execution time
         $metadataUpdateStruct->publicationDate = $publicationDate;
         $metadataUpdateStruct->modificationDate = $modificationDate ?? $currentTime;
+        $metadataUpdateStruct->isHidden = $isHidden;
 
         $contentHandlerMock->expects($this->once())
             ->method('publish')

diff --git a/eZ/Publish/SPI/Persistence/Content/CreateStruct.php b/eZ/Publish/SPI/Persistence/Content/CreateStruct.php
@@ -72,4 +72,11 @@ class CreateStruct extends ValueObject
      * @var int
      */
     public $modified;
+
+    /**
+     * Is hidden flag.
+     *
+     * @var bool
+     */
+    public $isHidden;
 }