Merged branch '3.3' of ezsystems/ezplatform-solr-search-engine into 4.6

ibexa · Jul 9, 2024 · 73dca96 · 73dca96
2 parents 4585e3a + 19ff229
commit 73dca96
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/lib/FieldMapper/ContentTranslationFieldMapper/BlockDocumentsContentFields.php b/src/lib/FieldMapper/ContentTranslationFieldMapper/BlockDocumentsContentFields.php
@@ -72,7 +72,7 @@ public function mapFields(Content $content, $languageCode)
             }
 
             foreach ($contentType->fieldDefinitions as $fieldDefinition) {
-                if ($fieldDefinition->id !== $field->fieldDefinitionId) {
+                if ($fieldDefinition->id !== $field->fieldDefinitionId || !$fieldDefinition->isSearchable) {
                     continue;
                 }
 

diff --git a/src/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentFulltextFields.php b/src/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentFulltextFields.php
@@ -126,7 +126,7 @@ private function doMapFields(Content $content, ContentType $contentType, $langua
             }
 
             foreach ($contentType->fieldDefinitions as $fieldDefinition) {
-                if ($fieldDefinition->id !== $field->fieldDefinitionId) {
+                if ($fieldDefinition->id !== $field->fieldDefinitionId || !$fieldDefinition->isSearchable) {
                     continue;
                 }
 
@@ -138,7 +138,7 @@ private function doMapFields(Content $content, ContentType $contentType, $langua
                         continue;
                     }
 
-                    if (!$indexField->type instanceof FieldType\FullTextField || !$fieldDefinition->isSearchable) {
+                    if (!$indexField->type instanceof FieldType\FullTextField) {
                         continue;
                     }