Ticket #2463: related.diff

store/django/django/db/models/fields/__init__.py

@@ -289 +289 @@
         if self.choices:
             return first_choice + list(self.choices)
         rel_model = self.rel.to
-        return first_choice + [(getattr(x, self.rel.get_related_field().attname), str(x))
-                               for x in rel_model._default_manager.complex_filter(self.rel.limit_choices_to)]
+        lst = []
+        for x in rel_model._default_manager.complex_filter(self.rel.limit_choices_to):
+            if hasattr(self.rel, 'get_related_field'):
+                lst.append((getattr(x, self.rel.get_related_field().attname), str(x)))
+            else:
+                lst.append((x._get_pk_val(), str(x)))
+        return first_choice + lst
 
     def get_choices_default(self):
         if self.radio_admin: