Add OCR migration dependency

Signed-off-by: Roberto Rosario <roberto.rosario@mayan-edms.com>

HISTORY.rst

@@ -83,8 +83,6 @@
 - 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)
 ==================

mayan/apps/dynamic_search/settings.py

@@ -1,17 +0,0 @@
-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.'
-    )
-)
-

mayan/apps/dynamic_search/templates/dynamic_search/search_box.html

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

mayan/apps/ocr/migrations/0008_auto_20180917_0646.py

@@ -8,6 +8,9 @@ class Migration(migrations.Migration):
     dependencies = [
         ('ocr', '0007_auto_20170827_1617'),
     ]
+    run_before = [
+        ('documents', '0052_rename_document_page'),
+    ]
 
     operations = [
         migrations.AlterField(