Merge pull request #8 from benzkji/develop

make cms index optional, fix ugly placeholderindexing bug
bnzk · Jan 31, 2024 · 0e64cda · 0e64cda
2 parents a217523 + 475874d
commit 0e64cda
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/postgres_searchindex/conf.py b/postgres_searchindex/conf.py
@@ -8,7 +8,6 @@
     },
 )
 
-
 LANGUAGE_2_PGCONFIG = getattr(
     settings,
     "POSTGRES_SEARCHINDEX_LANGUAGE_2_PGCONFIG",
@@ -18,3 +17,9 @@
         "fr": "french",
     },
 )
+
+USE_CMS_INDEX = getattr(
+    settings,
+    "POSTGRES_SEARCHINDEX_USE_CMS_INDEX",
+    True,
+)
diff --git a/postgres_searchindex/contrib/djangocms/index_sources.py b/postgres_searchindex/contrib/djangocms/index_sources.py
@@ -5,6 +5,7 @@
 from postgres_searchindex.base import MultiLanguageIndexSource
 from postgres_searchindex.contrib.djangocms.base import PlaceholderIndexSourceMixin
 from postgres_searchindex.source_pool import source_pool
+from postgres_searchindex import conf
 
 
 class TitleIndexSource(PlaceholderIndexSourceMixin, MultiLanguageIndexSource):
@@ -27,8 +28,7 @@ def get_placeholder_content(self, obj, language, request):
         )
         text = ""
         for base_plugin in plugins:
-            text = " " + self.get_plugin_search_text(base_plugin, request)
-
+            text += " " + self.get_plugin_search_text(base_plugin, request)
         return text
 
     def get_queryset(self):
@@ -49,4 +49,5 @@ def get_queryset(self):
         return queryset.distinct()
 
 
-source_pool.register(TitleIndexSource)
+if conf.USE_CMS_INDEX:
+    source_pool.register(TitleIndexSource)