Revert "FP-1099: …" (remove all of FP-1099 from dev branch)

Revert "FP-1099: Clarify Search feature value results"

This reverts commit 9ce83d2.

Revert "FP-1099: Make Search a feature"

This reverts commit 7ebecb1.

Revert "FP-1099: Test: Disable reindex on publish"

This reverts commit 580a7a5.

Author: wesleyboar

taccsite_cms/default_secrets.py

@@ -157,13 +157,6 @@
     # SEE: https://confluence.tacc.utexas.edu/x/EwDeCg
     # SEE: https://confluence.tacc.utexas.edu/x/FAA9Cw
     "blog": False,
-
-    # Search
-    # - `True`  (Portal:       allow search,          Any CMS: allow index)
-    # - (falsy) (Portal & CMS: allow search & index,  SAD CMS: never index)
-    # - `False` (Portal:       no search bar,         Any CMS: never index)
-    # FP-1099: Search can be disabled as a workaround to suspected index bug
-    "search": None,
 }
 
 ########################

taccsite_cms/settings.py

@@ -232,6 +232,8 @@ def getsecrets():
     'djangocms_bootstrap4.contrib.bootstrap4_picture',
     'djangocms_bootstrap4.contrib.bootstrap4_tabs',
     'djangocms_bootstrap4.contrib.bootstrap4_utilities',
+    'haystack',
+    'aldryn_apphooks_config',
     # For faster testing, disable migrations during database creation
     # SEE: https://stackoverflow.com/a/37150997
     'test_without_migrations',
@@ -382,8 +384,8 @@ def get_subdirs_as_module_names(path):
     for feature in FEATURES:
         print(feature + ": ", FEATURES[feature])
 
-# Support Blog/News & Social Media Metadata
-if FEATURES['blog']:
+if current_secrets._FEATURES['blog']:
+    # Install required apps
     INSTALLED_APPS += [
         # Blog/News
         # 'filer',              # Already added
@@ -399,54 +401,27 @@ def get_subdirs_as_module_names(path):
         'djangocms_page_meta',
     ]
 
-    # Configure metadata
+    # Metadata: Configure
     META_SITE_PROTOCOL = 'http'
     META_USE_SITES = True
     META_USE_OG_PROPERTIES = True
     META_USE_TWITTER_PROPERTIES = True
     META_USE_GOOGLEPLUS_PROPERTIES = True # django-meta 1.x+
     # META_USE_SCHEMAORG_PROPERTIES=True  # django-meta 2.x+
 
-    # Set custom paths for templates
+    # Blog/News: Set custom paths for templates
     BLOG_PLUGIN_TEMPLATE_FOLDERS = (
         ('plugins/default', 'Default template'),    # i.e. `templates/djangocms_blog/plugins/default/`
         ('plugins/default-clone', 'Clone of default template'),  # i.e. `templates/djangocms_blog/plugins/default-clone/`
     )
 
-    # Change default values for the auto-setup of one `BlogConfig`
+    # Blog/News: Change default values for the auto-setup of one `BlogConfig`
     # SEE: https://github.com/nephila/djangocms-blog/issues/629
     BLOG_AUTO_SETUP = True
     BLOG_AUTO_HOME_TITLE ='Home'
     BLOG_AUTO_BLOG_TITLE = 'News'
     BLOG_AUTO_APP_TITLE = 'News'
 
-# Support Portal search or CMS indexing
-if 'search' in FEATURES and (
-    FEATURES['search']
-    # FAQ: Portals can search by default, but may not set `FEATURES['search']`
-    or (PORTAL and FEATURES['search'] != False)
-):
-    INSTALLED_APPS += [
-        'haystack',
-        'aldryn_apphooks_config',
-    ]
-
-    # Elasticsearch Indexing
-    HAYSTACK_ROUTERS = ['aldryn_search.router.LanguageRouter',]
-    HAYSTACK_SIGNAL_PROCESSOR = 'taccsite_cms.signal_processor.RealtimeSignalProcessor'
-    ALDRYN_SEARCH_DEFAULT_LANGUAGE = 'en'
-    ALDRYN_SEARCH_REGISTER_APPHOOK = True
-    HAYSTACK_CONNECTIONS = {
-        'default': {
-            'ENGINE': 'haystack.backends.elasticsearch_backend.ElasticsearchSearchEngine',
-            'URL': current_secrets._ES_HOSTS,
-            'INDEX_NAME': current_secrets._ES_INDEX_PREFIX.format('cms'),
-            'KWARGS': {'http_auth': current_secrets._ES_AUTH }
-        }
-    }
-
-    ES_DOMAIN = current_secrets._ES_DOMAIN
-
 
 DJANGOCMS_PICTURE_NESTING = True
 DJANGOCMS_PICTURE_RESPONSIVE_IMAGES = True
@@ -497,6 +472,22 @@ def get_subdirs_as_module_names(path):
 # Use a custom namespace (using default settings.VARIABLE configuration)
 SETTINGS_EXPORT_VARIABLE_NAME = 'settings'
 
+# Elasticsearch Indexing
+HAYSTACK_ROUTERS = ['aldryn_search.router.LanguageRouter',]
+HAYSTACK_SIGNAL_PROCESSOR = 'taccsite_cms.signal_processor.RealtimeSignalProcessor'
+ALDRYN_SEARCH_DEFAULT_LANGUAGE = 'en'
+ALDRYN_SEARCH_REGISTER_APPHOOK = True
+HAYSTACK_CONNECTIONS = {
+    'default': {
+        'ENGINE': 'haystack.backends.elasticsearch_backend.ElasticsearchSearchEngine',
+        'URL': current_secrets._ES_HOSTS,
+        'INDEX_NAME': current_secrets._ES_INDEX_PREFIX.format('cms'),
+        'KWARGS': {'http_auth': current_secrets._ES_AUTH }
+    }
+}
+
+ES_DOMAIN = current_secrets._ES_DOMAIN
+
 # Exported settings.
 SETTINGS_EXPORT = [
     'DEBUG',

taccsite_cms/templates/header.html

@@ -23,7 +23,7 @@
       {% include "nav_cms.html" with className="navbar-nav" %}
 
       {# NOTE: As of 2020-12, search is only available with a Portal #}
-      {% if settings.FEATURES.search != False %}{% include "nav_search.html" with className="form-inline  ml-auto" only %}{% endif %}
+      {% include "nav_search.html" with className="form-inline  ml-auto" only %}
       {% include "nav_portal.html" with className="navbar-nav" settings=settings only %}
     {% else %}
       {# FAQ: If template were included with `only`, then it would NOT render `show_menu` #}