Ticket #12875: ticket_12875.diff

django/contrib/admin/options.py

@@ -259 +259 @@
         )
         return urlpatterns
 
+    def get_ordering(self, request):
+        return None
+
     def urls(self):
         return self.get_urls()
     urls = property(urls)

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'