matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/features/disable_simple_search' into clients/bc

Browse Source
This commit is contained in:
Roberto Rosario
2019-10-11 10:53:50 -04:00
parent 5227e196d0 9b7f133249
commit 24cf9dcb0f
3 changed files with 51 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY.rst
View File

@@ -83,6 +83,8 @@
- Remove the DOCUMENTS_DISABLE_BASE_IMAGE_CACHE,
DOCUMENTS_DISABLE_TRANSFORMED_IMAGE_CACHE, and
DOCUMENTS_FIX_ORIENTATION settings.
- Support simple search disable via the new
SEARCH_DISABLE_SIMPLE_SEARCH setting.
3.2.8 (2019-10-01)
==================

17
mayan/apps/dynamic_search/settings.py Normal file
View File

@@ -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.'
)
)

37
mayan/apps/dynamic_search/templates/dynamic_search/search_box.html
View File

@@ -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 %}
<div class="row">
<div class="col-xs-6 col-xs-offset-3">
{% endif %}
<div class="well center-block">
<div class="row">
<div class="col-xs-12">
<form action="{% url 'search:results' %}" class="form-horizontal" id="formSearch" method="get" role="search">
<div class="col-sm-2">
{% if setting_disable_simple_search == False %}
<div class="col-sm-2">
{% else %}
<div class="col-sm-8">
{% endif %}
<select class="form-control" id="selectSearchModel" name="_search_model">
{% for search_model in search_models %}
{{ search_model.self.get_full_name }}
@@ -16,12 +28,21 @@
</select>
</div>
<div class="col-sm-10">
{% if setting_disable_simple_search == False %}
<div class="col-sm-10">
{% else %}
<div class="col-sm-4">
{% endif %}
<div class="input-group">
<input class="form-control" name="q" placeholder="{% trans 'Search terms' %}" type="text" value="{{ search_terms|default:'' }}">
{% if setting_disable_simple_search == False %}
<input class="form-control" name="q" placeholder="{% trans 'Search terms' %}" type="text" value="{{ search_terms|default:'' }}">
{% endif %}
<span class="input-group-btn">
<button class="btn btn-default" type="submit">{% trans 'Search' %}</button>
<a class="btn btn-primary" href="" id="btnSearchAdvanced" >{% trans 'Advanced' %}</a>
{% if setting_disable_simple_search == False %}
<button class="btn btn-default" type="submit">{% trans 'Search' %}</button>
{% endif %}
<a class="btn btn-primary" href="" id="btnSearchAdvanced" > {% if setting_disable_simple_search == False %}{% trans 'Advanced' %}{% else %}{% trans 'Advanced search' %}{% endif %}</a>
</span>
</div>
</div>
@@ -30,6 +51,12 @@
</div>
</div>
{% if setting_disable_simple_search %}
</div>
</div>
{% endif %}
<script>
jQuery(document).ready(function() {
var $selectSearchModel = $('#selectSearchModel');