Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

newforms-admin: Fixed ordering for ModelAdmin.queryset. Refs #4926, b…

…ut that ticket still needs ModelAdmin.changelist_view to use ModelAdmin.queryset.

git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@6232 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 5ec5814bf97844db349b0e418668cc4c3edfbea4 1 parent 64b9123
@jkocherhans jkocherhans authored
View
2  django/contrib/admin/options.py
@@ -292,7 +292,7 @@ def queryset(self, request):
Returns a QuerySet of all model instances that can be edited by the
admin site.
"""
- return self.model._default_manager.get_query_set()
+ return self.model._default_manager.get_query_set().order_by(*self.ordering)
def queryset_add(self, request):
"""
View
0  tests/regressiontests/admin_ordering/__init__.py
No changes.
View
39 tests/regressiontests/admin_ordering/models.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+from django.db import models
+
+class Band(models.Model):
+ name = models.CharField(max_length=100)
+ bio = models.TextField()
+ rank = models.IntegerField()
+
+ class Meta:
+ ordering = ('name',)
+
+__test__ = {'API_TESTS': """
+
+Let's make sure that ModelAdmin.queryset uses the ordering we define in
+ModelAdmin rather that ordering defined in the model's inner Meta
+class.
+
+>>> from django.contrib.admin.options import ModelAdmin
+
+>>> b1 = Band(name='Aerosmith', bio='', rank=3)
+>>> b1.save()
+>>> b2 = Band(name='Radiohead', bio='', rank=1)
+>>> b2.save()
+>>> b3 = Band(name='Van Halen', bio='', rank=2)
+>>> b3.save()
+
+>>> class BandAdmin(ModelAdmin):
+... ordering = ('rank',) # default ordering is ('name',)
+...
+
+>>> ma = BandAdmin(Band, None)
+>>> [b.name for b in Band.objects.all()]
+[u'Aerosmith', u'Radiohead', u'Van Halen']
+
+>>> [b.name for b in ma.queryset(None)]
+[u'Radiohead', u'Van Halen', u'Aerosmith']
+
+"""
+}
Please sign in to comment.
Something went wrong with that request. Please try again.