Issue netgen-layouts#7: Remove CJW stack comments and fix error if $t…

…his->contentProvider->provideLocation() doesnt return a location
cjw-network · Apr 25, 2024 · ad41270 · ad41270
1 parent cc5ad92
commit ad41270
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 31 deletions.
diff --git a/CHANGELOG_CJW b/CHANGELOG_CJW
diff --git a/bundle/Resources/translations/nglayouts.en.yaml b/bundle/Resources/translations/nglayouts.en.yaml
@@ -3,11 +3,7 @@ block.ibexa_content_field.field_identifier: 'Field identifier'
 block.ibexa_component.content: 'Content'
 
 query.ibexa_content_search.use_current_location: 'Use current location as parent'
-
-# CJW Stack
 query.ibexa_content_search.use_parent_location: 'Use parent location as parent'
-# -- CJW Stack
-
 query.ibexa_content_search.parent_location_id: 'Parent location'
 query.ibexa_content_search.sort_direction: 'Sort direction'
 query.ibexa_content_search.sort_type: 'Sort type'

diff --git a/lib/Collection/QueryType/Handler/ContentSearchHandler.php b/lib/Collection/QueryType/Handler/ContentSearchHandler.php
@@ -115,11 +115,7 @@ public function getCount(Query $query): int
 
     public function isContextual(Query $query): bool
     {
-        // CJW Stack
         return $query->getParameter('use_current_location')->getValue() === true || $query->getParameter('use_parent_location')->getValue() === true;
-        // -- CJW Stack
-
-        //return $query->getParameter('use_current_location')->getValue() === true;
     }
 
     /**

diff --git a/lib/Collection/QueryType/Handler/Traits/ParentLocationTrait.php b/lib/Collection/QueryType/Handler/Traits/ParentLocationTrait.php
@@ -42,10 +42,6 @@ private function setLocationService(LocationService $locationService): void
      */
     private function buildParentLocationParameters(ParameterBuilderInterface $builder, array $groups = []): void
     {
-        //
-        // CJW Stack
-        //
-
         $builder->add(
             'use_parent_location',
             ParameterType\Compound\BooleanType::class,
@@ -54,8 +50,6 @@ private function buildParentLocationParameters(ParameterBuilderInterface $builde
             ],
         );
 
-        // -- CJW Stack
-
         $builder->add(
             'use_current_location',
             ParameterType\Compound\BooleanType::class,
@@ -83,12 +77,16 @@ private function getParentLocation(ParameterCollectionInterface $parameterCollec
         if ($parameterCollection->getParameter('use_current_location')->getValue() === true) {
             return $this->contentProvider->provideLocation();
         }
-        // CJW Stack
         elseif ( $parameterCollection->getParameter('use_parent_location')->getValue() === true )
         {
-            return $this->contentProvider->provideLocation()->getParentLocation();
+            $currentLocation = $this->contentProvider->provideLocation();
+
+            if ( $currentLocation instanceof Location )
+            {
+                return $currentLocation->getParentLocation();
+            }
+
         }
-        // -- CJW Stack
 
         $parentLocationId = $parameterCollection->getParameter('parent_location_id')->getValue();
         if ($parentLocationId === null) {