Merge pull request #48 from blankse/EZP-26831

EZP-26831 Make newContentCreateStruct respect ContentType defaultAlwaysAvailable
netgen · Jan 27, 2017 · bbe72f7 · bbe72f7
2 parents 2b4686f + d366306
commit bbe72f7
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 2 deletions.
diff --git a/eZ/Publish/API/Repository/ContentService.php b/eZ/Publish/API/Repository/ContentService.php
@@ -399,6 +399,8 @@ public function loadTranslationInfos( ContentInfo $contentInfo, array $filter =
     /**
      * Instantiates a new content create struct object
      *
+     * alwaysAvailable is set to the ContentType's defaultAlwaysAvailable
+     *
      * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $contentType
      * @param string $mainLanguageCode
      *

diff --git a/eZ/Publish/Core/REST/Client/ContentService.php b/eZ/Publish/Core/REST/Client/ContentService.php
@@ -660,6 +660,8 @@ public function deleteRelation( VersionInfo $sourceVersion, ContentInfo $destina
     /**
      * Instantiates a new content create struct object
      *
+     * alwaysAvailable is set to the ContentType's defaultAlwaysAvailable
+     *
      * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $contentType
      * @param string $mainLanguageCode
      *

diff --git a/eZ/Publish/Core/Repository/ContentService.php b/eZ/Publish/Core/Repository/ContentService.php
@@ -1986,6 +1986,8 @@ public function loadTranslationInfos( ContentInfo $contentInfo, array $filter =
     /**
      * Instantiates a new content create struct object
      *
+     * alwaysAvailable is set to the ContentType's defaultAlwaysAvailable
+     *
      * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $contentType
      * @param string $mainLanguageCode
      *
@@ -1996,7 +1998,8 @@ public function newContentCreateStruct( ContentType $contentType, $mainLanguageC
         return new ContentCreateStruct(
             array(
                 "contentType" => $contentType,
-                "mainLanguageCode" => $mainLanguageCode
+                "mainLanguageCode" => $mainLanguageCode,
+                'alwaysAvailable' => $contentType->defaultAlwaysAvailable
             )
         );
     }

diff --git a/eZ/Publish/Core/Repository/Tests/Service/Integration/ContentBase.php b/eZ/Publish/Core/Repository/Tests/Service/Integration/ContentBase.php
@@ -696,7 +696,7 @@ public function testNewContentCreateStructValues( array $data )
             "contentType" => $contentType,
             "sectionId" => null,
             "ownerId" => null,
-            "alwaysAvailable" => null,
+            "alwaysAvailable" => $contentType->defaultAlwaysAvailable,
             "remoteId" => null,
             "mainLanguageCode" => "eng-GB",
             "modificationDate" => null

diff --git a/eZ/Publish/Core/SignalSlot/ContentService.php b/eZ/Publish/Core/SignalSlot/ContentService.php
@@ -620,6 +620,8 @@ public function loadTranslationInfos( ContentInfo $contentInfo, array $filter =
     /**
      * Instantiates a new content create struct object
      *
+     * alwaysAvailable is set to the ContentType's defaultAlwaysAvailable
+     *
      * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $contentType
      * @param string $mainLanguageCode
      *