From 85225b3084b88ae77751c23313ff0bf90f72470e Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 16 Feb 2014 22:22:18 +0100 Subject: [PATCH] Fixed ev.search_object_tag(), which was a bit too greedy before. --- src/typeclasses/managers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/typeclasses/managers.py b/src/typeclasses/managers.py index e64fee583a..2c3b0afb9f 100644 --- a/src/typeclasses/managers.py +++ b/src/typeclasses/managers.py @@ -181,7 +181,8 @@ class TagManager(models.Manager): objclass = ContentType.objects.get_by_natural_key(*model.split(".", 1)).model_class() key_cands = Q(db_tags__db_key__iexact=key.lower().strip()) if key is not None else Q() cat_cands = Q(db_tags__db_category__iexact=category.lower().strip()) if category is not None else Q() - return objclass.objects.filter(db_tags__db_model=model, db_tags__db_tagtype=tagtype).filter(key_cands & cat_cands) + tag_crit = Q(db_tags__db_model=model, db_tags__db_tagtype=tagtype) + return objclass.objects.filter(tag_crit & key_cands & cat_cands) def create_tag(self, key=None, category=None, data=None, model="objects.objectdb", tagtype=None): """