Migration to Django 2.2 - fixes

- remove django-ajax-select
- fix migrations

3 files changed, 15 insertions, 43 deletions

diff --git a/archaeological_files/admin.py b/archaeological_files/admin.py
index 937293681..903e90568 100644
--- a/archaeological_files/admin.py
+++ b/archaeological_files/admin.py
@@ -17,14 +17,11 @@
 
 # See the file COPYING for details.
 
-from ajax_select import make_ajax_form
-
-from django import forms
 from django.conf import settings
 from django.conf.urls import url
-from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404, render
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from ishtar_common.apps import admin_site
@@ -46,23 +43,19 @@ class FileAdmin(HistorizedObjectAdmin):
     list_filter = ["file_type", "year"]
     if settings.COUNTRY == "fr":
         list_filter += ["saisine_type"]
-    search_fields = ("name", "towns__name", "permit_reference")
-    ajax_form_dict = HistorizedObjectAdmin.AJAX_FORM_DICT.copy()
-    ajax_form_dict.update(
-        {
-            "in_charge": "person",
-            "general_contractor": "person",
-            "corporation_general_contractor": "organization",
-            "responsible_town_planning_service": "person",
-            "planning_service": "organization",
-            "organization": "organization",
-            "scientist": "person",
-            "main_town": "town",
-            "towns": "town",
-            "related_file": "file",
-        }
-    )
-    form = make_ajax_form(models.File, ajax_form_dict)
+    search_fields = ("cached_label", "name", "towns__name", "permit_reference")
+    autocomplete_fields = HistorizedObjectAdmin.autocomplete_fields + [
+        "in_charge",
+        "general_contractor",
+        "corporation_general_contractor",
+        "responsible_town_planning_service",
+        "planning_service",
+        "organization",
+        "scientist",
+        "main_town",
+        "towns",
+        "related_file",
+    ]
     readonly_fields = HistorizedObjectAdmin.readonly_fields + [
         "raw_general_contractor",
         "raw_town_planning_service",
diff --git a/archaeological_files/lookups.py b/archaeological_files/lookups.py
deleted file mode 100644
index cd5d0f0d7..000000000
--- a/archaeological_files/lookups.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from ajax_select import register
-
-from ishtar_common.lookups import LookupChannel
-
-from django.db.models import Q
-from archaeological_files.models import File
-
-
-@register("file")
-class FileLookup(LookupChannel):
-    model = File
-
-    def get_query(self, q, request):
-        query = Q()
-        for term in q.strip().split(" "):
-            subquery = Q(cached_label__icontains=term)
-            query &= subquery
-        return self.model.objects.filter(query).order_by("cached_label")[:20]
-
-    def format_item_display(self, item):
-        return "<span class='ajax-label'>%s</span>" % item.cached_label
diff --git a/archaeological_files/migrations/0101_squashed.py b/archaeological_files/migrations/0101_squashed.py
index 0ef3a49c5..c0fba7285 100644
--- a/archaeological_files/migrations/0101_squashed.py
+++ b/archaeological_files/migrations/0101_squashed.py
@@ -81,7 +81,7 @@ class Migration(migrations.Migration):
                 'verbose_name': 'Archaeological file',
                 'verbose_name_plural': 'Archaeological files',
                 'ordering': ('cached_label',),
-                'permissions': (('view_file', 'Can view all Archaeological files'), ('view_own_file', 'Can view own Archaeological file'), ('add_own_file', 'Can add own Archaeological file'), ('change_own_file', 'Can change own Archaeological file'), ('delete_own_file', 'Can delete own Archaeological file'), ('close_file', 'Can close File')),
+                'permissions': (('view_own_file', 'Can view own Archaeological file'), ('add_own_file', 'Can add own Archaeological file'), ('change_own_file', 'Can change own Archaeological file'), ('delete_own_file', 'Can delete own Archaeological file'), ('close_file', 'Can close File')),
             },
             bases=(archaeological_operations.models.ClosedItem,
                    ishtar_common.models.DocumentItem, ishtar_common.models.StatisticItem, ishtar_common.models.TemplateItem, models.Model, ishtar_common.models.CachedGen, ishtar_common.models_common.FixAssociated, ishtar_common.models.CascasdeUpdate, ishtar_common.models.OwnPerms, ishtar_common.models.ValueGetter, ishtar_common.models.ShortMenuItem, ishtar_common.models.DashboardFormItem),