Ticket #12875: ticket_12875_for_r12454_with_tests.diff

django/contrib/admin/options.py

@@ -261 +261 @@
         )
         return urlpatterns
 
+    def get_ordering(self, request):
+        return None
+
     def urls(self):
         return self.get_urls()
     urls = property(urls)
@@ -325 +328 @@
         """
         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 ;)
+        ordering = self.get_ordering(request) or self.ordering or () # otherwise we might try to *None, which is bad ;)
         if ordering:
             qs = qs.order_by(*ordering)
         return qs

django/contrib/admin/views/main.py

@@ -63 +63 @@
         if ERROR_FLAG in self.params:
             del self.params[ERROR_FLAG]
 
-        self.order_field, self.order_type = self.get_ordering()
+        self.order_field, self.order_type = self.get_ordering(request)
         self.query = request.GET.get(SEARCH_VAR, '')
         self.query_set = self.get_query_set()
         self.get_results(request)
@@ -130 +130 @@
         self.multi_page = multi_page
         self.paginator = paginator
 
-    def get_ordering(self):
+    def get_ordering(self, request):
         lookup_opts, params = self.lookup_opts, self.params
-        # For ordering, first check the "ordering" parameter in the admin
+        # For ordering, first check if exists the "get_ordering" method
+        # in model admin, then check the "ordering" parameter in admin
         # options, then check the object's default ordering. If neither of
         # those exist, order descending by ID by default. Finally, look for
         # manually-specified ordering from the query string.
-        ordering = self.model_admin.ordering or lookup_opts.ordering or ['-' + lookup_opts.pk.name]
+        ordering = self.model_admin.get_ordering(request) or self.model_admin.ordering or lookup_opts.ordering or ['-' + lookup_opts.pk.name]
 
         if ordering[0].startswith('-'):
             order_field, order_type = ordering[0][1:], 'desc'

tests/regressiontests/admin_ordering/models.py

@@ -42 +42 @@
 >>> [b.name for b in ma.queryset(None)]
 [u'Radiohead', u'Van Halen', u'Aerosmith']
 
+
+Let's use a custom ModelAdmin that changes the ordering dinamically.
+
+>>> class DynOrderingBandAdmin(ModelAdmin):
+...     def get_ordering(self, request):
+...         if request.user.is_superuser:
+...             return ('rank',)
+...         else:
+...             return ('name',)
+
+>>> from django.contrib.auth.models import User
+>>> super_user = User.objects.create(username='admin', is_superuser=True)
+>>> other_user = User.objects.create(username='other')
+>>> class DummyRequest(object): pass
+>>> request = DummyRequest()
+
+Ordering will be different for a super user and a normal one
+
+>>> request.user = super_user
+>>> ma = DynOrderingBandAdmin(Band, None)
+>>> [b.name for b in ma.queryset(request)]
+[u'Radiohead', u'Van Halen', u'Aerosmith']
+>>> request.user = other_user
+>>> [b.name for b in ma.queryset(request)]
+[u'Aerosmith', u'Radiohead', u'Van Halen']
+
 """
 }

tests/regressiontests/modeladmin/models.py

@@ -8 +8 @@
     name = models.CharField(max_length=100)
     bio = models.TextField()
     sign_date = models.DateField()
-    
+
     def __unicode__(self):
         return self.name
 
@@ -147 +147 @@
 >>> from django import forms
 >>> class AdminBandForm(forms.ModelForm):
 ...     delete = forms.BooleanField()
-...     
+...
 ...     class Meta:
 ...         model = Band