diff --git a/HISTORY.rst b/HISTORY.rst index bb00dee4a8..3dd33f1412 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -80,6 +80,7 @@ Deploy a Redis container. - Improve document version upload form. - Use dropzone for document version upload form. +<<<<<<< HEAD - Allow the "Execute document tools" permission to be granted via ACL. - Add support for custom IMAP search criteria. @@ -90,6 +91,8 @@ - Add support for specifing a destination IMAP mailbox for processed messages. GitLab issue #399. Thanks to Robert Schöftner (@robert.schoeftner). +- Support simple search disable via the new + SEARCH_DISABLE_SIMPLE_SEARCH setting. 3.2.8 (2019-10-01) ================== diff --git a/docs/releases/3.3.rst b/docs/releases/3.3.rst index 27018030d6..1b6f847934 100644 --- a/docs/releases/3.3.rst +++ b/docs/releases/3.3.rst @@ -97,6 +97,8 @@ Changes Robert Schöftner (@robert.schoeftner). - Add support to execute the IMAP expunge command after each processed message. +- Support simple search disable via the new + SEARCH_DISABLE_SIMPLE_SEARCH setting. Removals -------- diff --git a/mayan/apps/dynamic_search/settings.py b/mayan/apps/dynamic_search/settings.py new file mode 100644 index 0000000000..7d48be879b --- /dev/null +++ b/mayan/apps/dynamic_search/settings.py @@ -0,0 +1,17 @@ +from __future__ import unicode_literals + +from django.conf import settings +from django.utils.translation import ugettext_lazy as _ + +from mayan.apps.smart_settings.classes import Namespace + +namespace = Namespace(label=_('Search'), name='search') + +setting_disable_simple_search = namespace.add_setting( + global_name='SEARCH_DISABLE_SIMPLE_SEARCH', + default=False, help_text=_( + 'Disables the single term bar search leaving only the advanced ' + 'search button.' + ) +) + diff --git a/mayan/apps/dynamic_search/templates/dynamic_search/search_box.html b/mayan/apps/dynamic_search/templates/dynamic_search/search_box.html index d9005b2224..23d7c09c22 100644 --- a/mayan/apps/dynamic_search/templates/dynamic_search/search_box.html +++ b/mayan/apps/dynamic_search/templates/dynamic_search/search_box.html @@ -1,13 +1,25 @@ {% load i18n %} {% load search_tags %} +{% load smart_settings_tags %} + {% get_search_models as search_models %} +{% smart_setting global_name="SEARCH_DISABLE_SIMPLE_SEARCH" as setting_disable_simple_search %} + +{% if setting_disable_simple_search %} +
+
+ {% endif %}