Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #13241. order_with_respect_to now works with ForeignKeys who re…

…fer to their model lazily (i.e. with a string). Thanks to Gabriel Grant for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14045 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit ccc43508e3d15c683d941f96c23e1e6ebd32ea5d 1 parent 5c5f1cf
@alex alex authored
View
1  AUTHORS
@@ -198,6 +198,7 @@ answer newbie questions, and generally made Django that much better:
David Gouldin <dgouldin@gmail.com>
pradeep.gowda@gmail.com
Collin Grady <collin@collingrady.com>
+ Gabriel Grant <g@briel.ca>
Simon Greenhill <dev@simon.net.nz>
Owen Griffiths
Espen Grindhaug <http://grindhaug.org/>
View
24 django/db/models/base.py
@@ -5,7 +5,8 @@
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,8 +224,25 @@ def _prepare(cls):
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:
View
10 tests/modeltests/order_with_respect_to/models.py
@@ -17,3 +17,13 @@ class Meta:
def __unicode__(self):
return unicode(self.text)
+
+class Post(models.Model):
+ title = models.CharField(max_length=200)
+ parent = models.ForeignKey("self", related_name="children", null=True)
+
+ class Meta:
+ order_with_respect_to = "parent"
+
+ def __unicode__(self):
+ return self.title
View
11 tests/modeltests/order_with_respect_to/tests.py
@@ -2,7 +2,7 @@
from django.test import TestCase
-from models import Question, Answer
+from models import Post, Question, Answer
class OrderWithRespectToTests(TestCase):
@@ -60,3 +60,12 @@ def test_basic(self):
],
attrgetter("text")
)
+
+ def test_recursive_ordering(self):
+ p1 = Post.objects.create(title='1')
+ p2 = Post.objects.create(title='2')
+ p1_1 = Post.objects.create(title="1.1", parent=p1)
+ p1_2 = Post.objects.create(title="1.2", parent=p1)
+ p2_1 = Post.objects.create(title="2.1", parent=p2)
+ p1_3 = Post.objects.create(title="1.3", parent=p1)
+ self.assertEqual(p1.get_post_order(), [p1_1.pk, p1_2.pk, p1_3.pk])
Please sign in to comment.
Something went wrong with that request. Please try again.