Merge branch '3.1'

netgen · Jan 15, 2025 · a4dceec · a4dceec
2 parents 7706bc0 + 015193c
commit a4dceec
Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.../Content/CriterionVisitor/UserEnabled.php → ...y/Common/CriterionVisitor/UserEnabled.php b/.../Content/CriterionVisitor/UserEnabled.php → ...y/Common/CriterionVisitor/UserEnabled.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Netgen\IbexaSearchExtra\Core\Search\Solr\Query\Content\CriterionVisitor;
+namespace Netgen\IbexaSearchExtra\Core\Search\Solr\Query\Common\CriterionVisitor;
 
 use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion;
 use Ibexa\Contracts\Solr\Query\CriterionVisitor;

diff --git a/lib/Resources/config/search/solr/criterion_visitors.yaml b/lib/Resources/config/search/solr/criterion_visitors.yaml
@@ -95,6 +95,7 @@ services:
             - { name: ibexa.search.solr.query.location.criterion.visitor }
 
     netgen.ibexa_search_extra.solr.query.content.criterion_visitor.user_enabled:
-        class: Netgen\IbexaSearchExtra\Core\Search\Solr\Query\Content\CriterionVisitor\UserEnabled
+        class: Netgen\IbexaSearchExtra\Core\Search\Solr\Query\Common\CriterionVisitor\UserEnabled
         tags:
             - { name: ibexa.search.solr.query.content.criterion.visitor }
+            - { name: ibexa.search.solr.query.location.criterion.visitor }
diff --git a/lib/Resources/config/search/solr/field_mappers.yaml b/lib/Resources/config/search/solr/field_mappers.yaml
@@ -28,7 +28,7 @@ services:
         tags:
             - { name: ibexa.search.solr.field.mapper.location }
 
-    netgen.ibexa_search_extra.solr.field_mapper.content.user_enabled:
+    netgen.ibexa_search_extra.solr.field_mapper.common.user_enabled:
         class: Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\Content\UserEnabledFieldMapper
         tags:
-            - { name: ibexa.search.solr.field.mapper.content }
+            - { name: ibexa.search.solr.field.mapper.block }