Ticket #10163: 10163.diff

django/forms/models.py

@@ -387 +387 @@
                 qs = self.queryset
             else:
                 qs = self.model._default_manager.get_query_set()
+            qry = getattr(qs, 'query', None)
+            if qry:
+                ordered = False
+                if qry.extra_order_by:
+                    ordered = True
+                elif not qry.default_ordering:
+                    ordered = qry.order_by
+                else:
+                    ordered = qry.order_by or qry.model._meta.ordering
+                if not ordered:
+                    qs = qs.order_by(self.model._meta.pk.name)            
             if self.max_num > 0:
                 self._queryset = qs[:self.max_num]
             else: