Patch ajax lookup for Django 1.11

6 files changed, 28 insertions, 16 deletions

diff --git a/archaeological_context_records/lookups.py b/archaeological_context_records/lookups.py
index 92115d98b..3d7b16d4a 100644
--- a/archaeological_context_records/lookups.py
+++ b/archaeological_context_records/lookups.py
@@ -1,4 +1,6 @@
-from ajax_select import register, LookupChannel
+from ajax_select import register
+
+from ishtar_common.lookups import LookupChannel
 
 from django.db.models import Q
 
diff --git a/archaeological_files/lookups.py b/archaeological_files/lookups.py
index 90b904945..dab3fb38c 100644
--- a/archaeological_files/lookups.py
+++ b/archaeological_files/lookups.py
@@ -1,4 +1,6 @@
-from ajax_select import register, LookupChannel
+from ajax_select import register
+
+from ishtar_common.lookups import LookupChannel
 
 from django.db.models import Q
 from archaeological_files.models import File
diff --git a/archaeological_finds/lookups.py b/archaeological_finds/lookups.py
index 5b30035ad..c1298fb83 100644
--- a/archaeological_finds/lookups.py
+++ b/archaeological_finds/lookups.py
@@ -1,4 +1,6 @@
-from ajax_select import register, LookupChannel
+from ajax_select import register
+
+from ishtar_common.lookups import LookupChannel
 
 from django.db.models import Q
 from django.utils.encoding import force_text
@@ -11,16 +13,6 @@ from archaeological_finds import models
 class BaseFindLookup(LookupChannel):
     model = models.BaseFind
 
-    def get_objects(self, items):
-        # TODO: why IDs are not given here? M2M issue
-        ids = []
-        for item in items:
-            if hasattr(item, 'pk'):
-                ids.append(item.pk)
-            else:
-                ids.append(item)
-        return super(BaseFindLookup, self).get_objects(ids)
-
     def get_query(self, q, request):
         query = Q()
         for term in q.strip().split(' '):
diff --git a/archaeological_operations/lookups.py b/archaeological_operations/lookups.py
index 83cf6fa3a..c4027c2d2 100644
--- a/archaeological_operations/lookups.py
+++ b/archaeological_operations/lookups.py
@@ -1,4 +1,6 @@
-from ajax_select import register, LookupChannel
+from ajax_select import register
+
+from ishtar_common.lookups import LookupChannel
 
 from django.db.models import Q
 from django.utils.encoding import force_text
diff --git a/archaeological_warehouse/lookups.py b/archaeological_warehouse/lookups.py
index 57d3a892d..f4df88a7d 100644
--- a/archaeological_warehouse/lookups.py
+++ b/archaeological_warehouse/lookups.py
@@ -1,4 +1,6 @@
-from ajax_select import register, LookupChannel
+from ajax_select import register
+
+from ishtar_common.lookups import LookupChannel
 
 from django.db.models import Q
 from django.utils.encoding import force_text
diff --git a/ishtar_common/lookups.py b/ishtar_common/lookups.py
index 9570f8bc6..f409536da 100644
--- a/ishtar_common/lookups.py
+++ b/ishtar_common/lookups.py
@@ -1,10 +1,22 @@
-from ajax_select import register, LookupChannel
+from ajax_select import register, LookupChannel as BaseLookupChannel
 
 from django.conf import settings
 from django.db.models import Q
 from ishtar_common.models import Person, Organization, IshtarUser, Town, Author
 
 
+class LookupChannel(BaseLookupChannel):
+    def get_objects(self, items):
+        # TODO: why IDs are not given here? M2M issue
+        ids = []
+        for item in items:
+            if hasattr(item, 'pk'):
+                ids.append(item.pk)
+            else:
+                ids.append(item)
+        return super(LookupChannel, self).get_objects(ids)
+
+
 @register('town')
 class TownLookup(LookupChannel):
     model = Town