diff --git a/src/bundle/Controller/Content/ContentTreeController.php b/src/bundle/Controller/Content/ContentTreeController.php index 29a10e06e6..3170656df0 100644 --- a/src/bundle/Controller/Content/ContentTreeController.php +++ b/src/bundle/Controller/Content/ContentTreeController.php @@ -23,6 +23,7 @@ use Ibexa\Contracts\Core\Repository\Values\Content\Content; use Ibexa\Contracts\Core\Repository\Values\Content\Location; use Ibexa\Contracts\Core\Repository\Values\Content\Query; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Rest\Message; @@ -78,7 +79,7 @@ public function loadChildrenAction( int $parentLocationId, int $limit, int $offset, - Query\Criterion $filter + Criterion\LogicalAnd $filter ): Node { $location = $this->locationService->loadLocation($parentLocationId); $loadSubtreeRequestNode = new LoadSubtreeRequestNode($parentLocationId, $limit, $offset); @@ -86,6 +87,10 @@ public function loadChildrenAction( $sortClause = $request->query->get('sortClause', null); $sortOrder = $request->query->getAlpha('sortOrder', Query::SORT_ASC); + if (empty($filter->criteria)) { + $filter = null; + } + return $this->contentTreeNodeFactory->createNode( $location, $loadSubtreeRequestNode,