Ticket #18098: order_wrt.diff

django/db/models/base.py

@@ -233 +233 @@
             # defer creating accessors on the foreign class until we are
             # certain it has been created
             def make_foreign_order_accessors(field, model, cls):
+                # Derive method name from related_name if defined (and if not
+                # a self-join).
+                if field.rel.to != cls and field.rel.related_name:
+                    related_name = field.rel.related_name
+                else:
+                    related_name = cls.__name__.lower()
                 setattr(
                     field.rel.to,
-                    'get_%s_order' % cls.__name__.lower(),
+                    'get_%s_order' % related_name,
                     curry(method_get_order, cls)
                 )
                 setattr(
                     field.rel.to,
-                    'set_%s_order' % cls.__name__.lower(),
+                    'set_%s_order' % related_name,
                     curry(method_set_order, cls)
                 )
             add_lazy_relation(