Migration to Django 2.2 - fixes

- remove django-ajax-select
- fix migrations

1 files changed, 5 insertions, 17 deletions

diff --git a/archaeological_context_records/admin.py b/archaeological_context_records/admin.py
index 0c21484e5..7d6d85e08 100644
--- a/archaeological_context_records/admin.py
+++ b/archaeological_context_records/admin.py
@@ -17,9 +17,6 @@
 
 # See the file COPYING for details.
 
-from ajax_select import make_ajax_form
-from ajax_select.fields import AutoCompleteSelectField
-
 from django import forms
 from django.contrib import admin
 from django.contrib.gis.forms import PointField, MultiPolygonField, OSMWidget
@@ -55,22 +52,19 @@ class AdminContextRecordForm(forms.ModelForm):
     multi_polygon = MultiPolygonField(
         label=_("Multi polygon"), required=False, widget=OSMWidget
     )
-    operation = AutoCompleteSelectField("operation")
-    parcel = AutoCompleteSelectField("parcel", required=False)
-    town = AutoCompleteSelectField("town", required=False)
-    archaeological_site = AutoCompleteSelectField("archaeological_site", required=False)
-    lock_user = AutoCompleteSelectField("user", required=False)
 
 
 class ContextRecordAdmin(HistorizedObjectAdmin):
     list_display = ("label", "operation", "parcel")
     list_filter = ("unit",)
     search_fields = (
-        "label",
-        "parcel__operation__cached_label",
+        "cached_label",
+        "town",
         "parcel__section",
         "parcel__parcel_number",
     )
+    autocomplete_fields = ["operation", "parcel", "town", "archaeological_site",
+                           "lock_user"]
     model = models.ContextRecord
     form = AdminContextRecordForm
     readonly_fields = HistorizedObjectAdmin.readonly_fields + [
@@ -87,13 +81,7 @@ class RecordRelationsAdmin(admin.ModelAdmin):
     list_display = ("left_record", "relation_type", "right_record")
     list_filter = ("relation_type",)
     model = models.RecordRelations
-    form = make_ajax_form(
-        model,
-        {
-            "left_record": "context_record",
-            "right_record": "context_record",
-        },
-    )
+    autocomplete_fields = ["left_record", "right_record"]
 
 
 admin_site.register(models.RecordRelations, RecordRelationsAdmin)