Ticket #7151: 7151-patch2.diff

django/contrib/admin/views/main.py

@@ -716 +716 @@
                         qs = qs.select_related()
                         break
 
+<<<<<<< local
+        # Calculate lookup_order_field.
+        # If the order-by field is a field with a relationship, order by the
+        # value in the related table.
+        lookup_order_field = self.order_field
+        try:
+            f = self.lookup_opts.get_field(self.order_field, many_to_many=False)
+        except models.FieldDoesNotExist:
+            pass
+        else:
+            if isinstance(f.rel, models.OneToOneRel):
+                # For OneToOneFields, don't try to order by the related object's ordering criteria.
+                pass
+            elif isinstance(f.rel, models.ManyToOneRel):
+                rel_ordering = f.rel.to._meta.ordering and f.rel.to._meta.ordering[0] or f.rel.to._meta.pk.column
+                lookup_order_field = '%s__%s' % (f.name, rel_ordering)
+
+=======
+>>>>>>> other
         # Set ordering.
         if self.order_field:
             qs = qs.order_by('%s%s' % ((self.order_type == 'desc' and '-' or ''), self.order_field))

django/core/management/__init__.py

@@ -194 +194 @@
             options, args = parser.parse_args(self.argv)
             handle_default_options(options)
         except:
-            pass # Ignore any option errors at this point.
+            pass
 
         try:
             subcommand = self.argv[1]
@@ -203 +203 @@
             sys.exit(1)
 
         if subcommand == 'help':
-            if len(args) > 2:
-                self.fetch_command(args[2]).print_help(self.prog_name, args[2])
+            if len(self.argv) > 2:
+                self.fetch_command(self.argv[2]).print_help(self.prog_name, self.argv[2])
             else:
                 sys.stderr.write(self.main_help_text() + '\n')
                 sys.exit(1)