mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #12340 -- BaseGenericInlineFormSet.get_queryset now returns an ordered queryset.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11800 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Justin Bronn
2009-12-09 03:49:25 +00:00
parent 85bfaf1017
commit 81dd5c2473
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
django/contrib/contenttypes/generic.py
View File

@@ -317,10 +317,13 @@ class BaseGenericInlineFormSet(BaseModelFormSet):
from django.contrib.contenttypes.models import ContentType
if self.instance is None or self.instance.pk is None:
return self.model._default_manager.none()
return self.model._default_manager.filter(**{
qs = self.model._default_manager.filter(**{
self.ct_field.name: ContentType.objects.get_for_model(self.instance),
self.ct_fk_field.name: self.instance.pk,
})
if not qs.ordered:
qs = qs.order_by(self.model._meta.pk.name)
return qs
def save_new(self, form, commit=True):
# Avoid a circular import.