Ticket #34646: django_ordering.py.diff

django/contrib/admin/views/main.py

@@ -316 +316 @@
             ordering = self.lookup_opts.ordering
         return ordering
 
-    def get_ordering_field(self, field_name):
+    def get_ordering_fields(self, field_name):
         """
         Return the proper model field name corresponding to the given
         field_name to use for ordering. field_name may either be the name of a
@@ -361 +361 @@
                 try:
                     none, pfx, idx = p.rpartition("-")
                     field_name = self.list_display[int(idx)]
-                    order_field = self.get_ordering_field(field_name)
-                    if not order_field:
-                        continue  # No 'admin_order_field', skip it
-                    if isinstance(order_field, OrderBy):
-                        if pfx == "-":
-                            order_field = order_field.copy()
-                            order_field.reverse_ordering()
-                        ordering.append(order_field)
-                    elif hasattr(order_field, "resolve_expression"):
-                        # order_field is an expression.
-                        ordering.append(
-                            order_field.desc() if pfx == "-" else order_field.asc()
-                        )
-                    # reverse order if order_field has already "-" as prefix
-                    elif order_field.startswith("-") and pfx == "-":
-                        ordering.append(order_field[1:])
-                    else:
-                        ordering.append(pfx + order_field)
+                    order_fields = self.get_ordering_fields(field_name)
+                    if not isinstance(order_fields, (list, tuple)):
+                        order_fields = (order_fields,)
+                    for order_field in order_fields:
+                        if not order_field:
+                            continue  # No 'admin_order_field', skip it
+                        if isinstance(order_field, OrderBy):
+                            if pfx == "-":
+                                order_field = order_field.copy()
+                                order_field.reverse_ordering()
+                            ordering.append(order_field)
+                        elif hasattr(order_field, "resolve_expression"):
+                            # order_field is an expression.
+                            ordering.append(
+                                order_field.desc() if pfx == "-" else order_field.asc()
+                            )
+                        # reverse order if order_field has already "-" as prefix
+                        elif order_field.startswith("-") and pfx == "-":
+                            ordering.append(order_field[1:])
+                        else:
+                            ordering.append(pfx + order_field)
                 except (IndexError, ValueError):
                     continue  # Invalid ordering specified, skip it.
 
@@ -479 +482 @@
                 else:
                     order_type = "asc"
                 for index, attr in enumerate(self.list_display):
-                    if self.get_ordering_field(attr) == field:
+                    if self.get_ordering_fields(attr) == field:
                         ordering_fields[index] = order_type
                         break
         else: