From be4e86943e51a610aeac6482b22f7a93b1299776 Mon Sep 17 00:00:00 2001 From: Brian Rosner Date: Sun, 27 Apr 2008 15:31:55 +0000 Subject: [PATCH] newforms-admin: Fixed #7094 -- Fixed admin ordering breakage after the queryset-refactor changes from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7481 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/admin/options.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index c71a92de59..edf7c92d0f 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -295,8 +295,12 @@ class ModelAdmin(BaseModelAdmin): Returns a QuerySet of all model instances that can be edited by the admin site. This is used by changelist_view. """ + qs = self.model._default_manager.get_query_set() + # TODO: this should be handled by some parameter to the ChangeList. ordering = self.ordering or () # otherwise we might try to *None, which is bad ;) - return self.model._default_manager.get_query_set().order_by(*ordering) + if ordering: + qs.order_by(*ordering) + return qs def get_fieldsets(self, request, obj=None): "Hook for specifying fieldsets for the add form."