Cast type using the type of the field being referenced.

Usually this is just the pk type (int or string),
but if this is an inherited model then it has a rel using a OneToOneField
pointing to the base model.

Fixes: #153

Solution from here: #203
(original fork from @adsva is deleted so I cannot test and merge that)

Author: crucialfelix

ajax_select/lookup_channel.py

@@ -86,23 +86,21 @@ def format_item_display(self, obj):
         return escape(force_text(obj))
 
     def get_objects(self, ids):
-        """This is used to retrieve the currently selected objects for either ManyToMany or ForeignKey.
-
-        Note that the order of the ids supplied for ManyToMany fields is dependent on how the
-        objects manager fetches it.
-        ie. what is returned by `YourModel.{fieldname}_set.all()`
-
-        In most situations (especially postgres) this order is indeterminate -- not the order that you originally
-        added them in the interface.
-        See :doc:`/Ordered-ManyToMany` for a solution to this.
+        """
+        This is used to retrieve the currently selected objects for either ManyToMany or ForeignKey.
 
         Args:
             ids (list): list of primary keys
         Returns:
             list: list of Model objects
         """
-        # return objects in the same order as passed in here
-        pk_type = self.model._meta.pk.to_python
+        if self.model._meta.pk.rel is not None:
+            # Use the type of the field being referenced
+            pk_type = self.model._meta.pk.target_field.to_python
+        else:
+            pk_type = self.model._meta.pk.to_python
+
+        # Return objects in the same order as passed in here
         ids = [pk_type(pk) for pk in ids]
         things = self.model.objects.in_bulk(ids)
         return [things[aid] for aid in ids if aid in things]

tests/test_lookups.py

@@ -0,0 +1,21 @@
+
+from django.test import TestCase
+from django.contrib.auth.models import User
+from .lookups import UserLookup
+
+
+class TestLookups(TestCase):
+
+    def test_get_objects(self):
+        user1 = User.objects.create(username='user1',
+            email='[email protected]',
+            password='password')
+        user2 = User.objects.create(username='user2',
+            email='[email protected]',
+            password='password')
+        lookup = UserLookup()
+        users = lookup.get_objects([user2.id, user1.id])
+        self.assertEqual(len(users), 2)
+        u2, u1 = users
+        self.assertEqual(u1, user1)
+        self.assertEqual(u2, user2)