EZP-29518: ContentType option "Default field for sorting children" ha…

…s no effect on new created objects (#2428) * Fixed ContentType 'Default field for sorting children' * Fixed broken test and CS * Fixed not using FQCN for method parameters in PHP doc and added missing failsafe. * Fixed 'Cannot use isset() on the result of an expression' error * Added missing empty line before return statement.
ezsystems · Sep 25, 2018 · 73d0544 · 73d0544
1 parent b4417cd
commit 73d0544
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 16 deletions.
diff --git a/eZ/Publish/Core/REST/Client/LocationService.php b/eZ/Publish/Core/REST/Client/LocationService.php
@@ -17,6 +17,7 @@
 use eZ\Publish\Core\REST\Common\Input\Dispatcher;
 use eZ\Publish\Core\REST\Common\Output\Visitor;
 use eZ\Publish\Core\REST\Common\Message;
+use eZ\Publish\API\Repository\Values\ContentType\ContentType;
 
 /**
  * Location service, used for complex subtree operations.
@@ -79,16 +80,21 @@ public function setSession($id)
      * Instantiates a new location create class.
      *
      * @param mixed $parentLocationId the parent under which the new location should be created
+     * @param eZ\Publish\API\Repository\Values\ContentType\ContentType|null $contentType
      *
      * @return \eZ\Publish\API\Repository\Values\Content\LocationCreateStruct
      */
-    public function newLocationCreateStruct($parentLocationId)
+    public function newLocationCreateStruct($parentLocationId, ContentType $contentType = null)
     {
-        return new LocationCreateStruct(
-            array(
-                'parentLocationId' => $parentLocationId,
-            )
-        );
+        $properties = [
+            'parentLocationId' => $parentLocationId,
+        ];
+        if ($contentType) {
+            $properties['sortField'] = $contentType->defaultSortField;
+            $properties['sortOrder'] = $contentType->defaultSortOrder;
+        }
+
+        return new LocationCreateStruct($properties);
     }
 
     /**

diff --git a/eZ/Publish/Core/REST/Server/Controller/Content.php b/eZ/Publish/Core/REST/Server/Controller/Content.php
@@ -731,8 +731,12 @@ protected function parseContentRequest(Request $request)
     protected function doCreateContent(Request $request, RestContentCreateStruct $contentCreate)
     {
         try {
+            $contentCreateStruct = $contentCreate->contentCreateStruct;
+            $contentCreate->locationCreateStruct->sortField = $contentCreateStruct->contentType->defaultSortField;
+            $contentCreate->locationCreateStruct->sortOrder = $contentCreateStruct->contentType->defaultSortOrder;
+
             $content = $this->repository->getContentService()->createContent(
-                $contentCreate->contentCreateStruct,
+                $contentCreateStruct,
                 array($contentCreate->locationCreateStruct)
             );
         } catch (ContentValidationException $e) {

diff --git a/eZ/Publish/Core/Repository/ContentService.php b/eZ/Publish/Core/Repository/ContentService.php
@@ -11,6 +11,7 @@
 use eZ\Publish\API\Repository\ContentService as ContentServiceInterface;
 use eZ\Publish\API\Repository\Repository as RepositoryInterface;
 use eZ\Publish\API\Repository\Values\Content\Language;
+use eZ\Publish\Core\Repository\Values\Content\Location;
 use eZ\Publish\SPI\Persistence\Handler;
 use eZ\Publish\API\Repository\Values\Content\ContentUpdateStruct as APIContentUpdateStruct;
 use eZ\Publish\API\Repository\Values\ContentType\ContentType;
@@ -875,6 +876,14 @@ protected function buildSPILocationCreateStructs(array $locationCreateStructs)
                 );
             }
 
+            if (!array_key_exists($locationCreateStruct->sortField, Location::SORT_FIELD_MAP)) {
+                $locationCreateStruct->sortField = Location::SORT_FIELD_NAME;
+            }
+
+            if (!array_key_exists($locationCreateStruct->sortOrder, Location::SORT_ORDER_MAP)) {
+                $locationCreateStruct->sortOrder = Location::SORT_ORDER_ASC;
+            }
+
             $parentLocationIdSet[$locationCreateStruct->parentLocationId] = true;
             $parentLocation = $this->repository->getLocationService()->loadLocation(
                 $locationCreateStruct->parentLocationId

diff --git a/eZ/Publish/Core/Repository/LocationService.php b/eZ/Publish/Core/Repository/LocationService.php
@@ -33,6 +33,7 @@
 use Exception;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
+use eZ\Publish\API\Repository\Values\ContentType\ContentType;
 
 /**
  * Location service, used for complex subtree operations.
@@ -722,16 +723,21 @@ public function deleteLocation(APILocation $location)
      * Instantiates a new location create class.
      *
      * @param mixed $parentLocationId the parent under which the new location should be created
+     * @param eZ\Publish\API\Repository\Values\ContentType\ContentType|null $contentType
      *
      * @return \eZ\Publish\API\Repository\Values\Content\LocationCreateStruct
      */
-    public function newLocationCreateStruct($parentLocationId)
+    public function newLocationCreateStruct($parentLocationId, ContentType $contentType = null)
     {
-        return new LocationCreateStruct(
-            array(
-                'parentLocationId' => $parentLocationId,
-            )
-        );
+        $properties = [
+            'parentLocationId' => $parentLocationId,
+        ];
+        if ($contentType) {
+            $properties['sortField'] = $contentType->defaultSortField;
+            $properties['sortOrder'] = $contentType->defaultSortOrder;
+        }
+
+        return new LocationCreateStruct($properties);
     }
 
     /**

diff --git a/eZ/Publish/Core/SignalSlot/LocationService.php b/eZ/Publish/Core/SignalSlot/LocationService.php
@@ -21,6 +21,7 @@
 use eZ\Publish\Core\SignalSlot\Signal\LocationService\UnhideLocationSignal;
 use eZ\Publish\Core\SignalSlot\Signal\LocationService\MoveSubtreeSignal;
 use eZ\Publish\Core\SignalSlot\Signal\LocationService\DeleteLocationSignal;
+use eZ\Publish\API\Repository\Values\ContentType\ContentType;
 
 /**
  * LocationService class.
@@ -350,12 +351,13 @@ public function deleteLocation(Location $location)
      * Instantiates a new location create class.
      *
      * @param mixed $parentLocationId the parent under which the new location should be created
+     * @param eZ\Publish\API\Repository\Values\ContentType\ContentType|null $contentType
      *
      * @return \eZ\Publish\API\Repository\Values\Content\LocationCreateStruct
      */
-    public function newLocationCreateStruct($parentLocationId)
+    public function newLocationCreateStruct($parentLocationId, ContentType $contentType = null)
     {
-        return $this->service->newLocationCreateStruct($parentLocationId);
+        return $this->service->newLocationCreateStruct($parentLocationId, $contentType);
     }
 
     /**

diff --git a/eZ/Publish/Core/SignalSlot/Tests/LocationServiceTest.php b/eZ/Publish/Core/SignalSlot/Tests/LocationServiceTest.php
@@ -202,7 +202,7 @@ public function serviceProvider()
             ),
             array(
                 'newLocationCreateStruct',
-                array($rootId),
+                array($rootId, null),
                 $locationCreateStruct,
                 0,
             ),