Ticket #13241: 13241_unittest.2.diff

django/db/models/base.py

@@ -5 +5 @@
 from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned, FieldError, ValidationError, NON_FIELD_ERRORS
 from django.core import validators
 from django.db.models.fields import AutoField, FieldDoesNotExist
-from django.db.models.fields.related import OneToOneRel, ManyToOneRel, OneToOneField
+from django.db.models.fields.related import OneToOneRel, ManyToOneRel, OneToOneField, add_lazy_relation
 from django.db.models.query import delete_objects, Q
 from django.db.models.query_utils import CollectedObjects, DeferredAttribute
 from django.db.models.options import Options
@@ -223 +223 @@
         if opts.order_with_respect_to:
             cls.get_next_in_order = curry(cls._get_next_or_previous_in_order, is_next=True)
             cls.get_previous_in_order = curry(cls._get_next_or_previous_in_order, is_next=False)
-            setattr(opts.order_with_respect_to.rel.to, 'get_%s_order' % cls.__name__.lower(), curry(method_get_order, cls))
-            setattr(opts.order_with_respect_to.rel.to, 'set_%s_order' % cls.__name__.lower(), curry(method_set_order, cls))
+            # defer creating accessors on the foreign class until we are certain it has been created
+            def make_foreign_order_accessors(field, model, cls):
+                setattr(field.rel.to, 'get_%s_order' % cls.__name__.lower(), curry(method_get_order, cls))
+                setattr(field.rel.to, 'set_%s_order' % cls.__name__.lower(), curry(method_set_order, cls))
+            add_lazy_relation(cls, opts.order_with_respect_to, opts.order_with_respect_to.rel.to, make_foreign_order_accessors)
 
         # Give the class a docstring -- its definition.
         if cls.__doc__ is None:

tests/modeltests/order_with_respect_to/tests.py

@@ +1 @@
+from django.test import TestCase
+from modeltests.order_with_respect_to.models import Post
+
+class RecursiveTests(TestCase):
+    def test_recursive_ordering(self):
+        p1 = Post(title='1')
+        p1.save()
+        p2 = Post(title='2')
+        p2.save()
+        p1_1 = Post(title="1.1", parent=p1)
+        p1_1.save()
+        p1_2 = Post(title="1.2", parent=p1)
+        p1_2.save()
+        p2_1 = Post(title="2.1", parent=p2)
+        p2_1.save()
+        p1_3 = Post(title="1.3", parent=p1)
+        p1_3.save()
+        self.assertEqual(p1.get_post_order(), [3,4,6])

tests/modeltests/order_with_respect_to/models.py

@@ -76 +76 @@
 
 """
 }
+
+
+class Post(models.Model):
+    title = models.CharField(max_length=200)
+    parent = models.ForeignKey('Post', related_name="children", null=True)
+    # ... more fields
+
+    class Meta:
+        order_with_respect_to = 'parent'
+
+    def __unicode__(self):
+        return unicode(self.title)
+

AUTHORS

@@ -513 +513 @@
     Gasper Zejn <zejn@kiberpipa.org>
     Jarek Zgoda <jarek.zgoda@gmail.com>
     Cheng Zhang
+    Gabriel Grant <g@briel.ca>
 
 A big THANK YOU goes to: