Migration to Django 2.2 - fixes

- remove django-ajax-select
- fix migrations

1 files changed, 14 insertions, 21 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",