fix: wp-333 ecep search broken (#230)

* fix: wp-333 ecep search broken * fix: wi-69 use SEARCH_PATH setting * fix: wp-333 cms not exporting SEARCH_PATH setting
TACC · Nov 7, 2023 · 2cc4018 · 2cc4018
1 parent 15b1ddb
commit 2cc4018
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/ecep_cms/Dockerfile b/ecep_cms/Dockerfile
@@ -1,5 +1,5 @@
-# TACC/Core-CMS#v3.12.0-beta.3
-FROM taccwma/core-cms:aba079b
+# TACC/Core-CMS#743 (v4.2.0 candidate)
+FROM taccwma/core-cms:7cfefff
 
 WORKDIR /code
 

diff --git a/ecep_cms/src/taccsite_cms/settings_custom.py b/ecep_cms/src/taccsite_cms/settings_custom.py
@@ -78,12 +78,20 @@
     "img_file_src": "ecep_cms/img/favicon.ico"
 }
 
+########################
+# TACC: SEARCH
+########################
+
+# Support Google search instead of Portal's Elasticsearch
+SEARCH_PATH = '/site-search' # cuz Portal Nginx config hijacks /search
+SEARCH_QUERY_PARAM_NAME = 'q' # as Google expects
+
 ########################
 # TACC: PORTAL
 ########################
 
-INCLUDES_CORE_PORTAL = True
-INCLUDES_PORTAL_NAV = True
+INCLUDES_CORE_PORTAL = False
+INCLUDES_PORTAL_NAV = False
 INCLUDES_SEARCH_BAR = True
 
 ########################