Commit daaf93d3 by Alex Gaynor

SUpport lookups by Tag object.

parent 90fe33b7
......@@ -48,8 +48,18 @@ class TaggableManager(object):
raise ValueError("You can't do lookups other than \"in\" and \"exact\" on Tags")
if lookup_type == "exact":
value = [value]
qs = TaggedItem.objects.filter(tag__name__in=value).values_list("pk", flat=True)
sql, params = qs.query.as_sql()
if all(isinstance(v, Tag) for v in value):
qs = TaggedItem.objects.filter(tag__in=value)
elif all(isinstance(v, basestring) for v in value):
qs = TaggedItem.objects.filter(tag__name__in=value)
elif all(isinstance(v, int) for v in value):
# This one is really ackward, just don't do it. The ORM does it
# for deletes, but no one else gets to.
qs = TaggedItem.objects.filter(pk__in=value)
else:
# Fucking flip-floppers.
raise ValueError("You can't combine Tag objects and strings, pick one!")
sql, params = qs.values_list("pk", flat=True).query.as_sql()
return QueryWrapper(("(%s)" % sql), params)
def related_query_name(self):
......
......@@ -55,6 +55,9 @@ class LookupByTagTestCase(BaseTaggingTest):
self.assertEqual(list(Food.objects.filter(tags="red").distinct()), [apple])
tag = Tag.objects.get(name="woof")
self.assertEqual(list(Pet.objects.filter(tags=tag)), [dog])
class TaggableFormTestCase(BaseTaggingTest):
def test_form(self):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment