From db5e97546a2834d87cc262fab94123ed9601bb11 Mon Sep 17 00:00:00 2001 From: Griatch Date: Thu, 1 Feb 2018 21:28:35 +0100 Subject: [PATCH] Not working. Tried a different query-setup unsuccessfully. --- evennia/typeclasses/managers.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/evennia/typeclasses/managers.py b/evennia/typeclasses/managers.py index 990d7dabe6..ce84798dec 100644 --- a/evennia/typeclasses/managers.py +++ b/evennia/typeclasses/managers.py @@ -244,7 +244,6 @@ class TypedObjectManager(idmapper.manager.SharedMemoryManager): # query.append(("db_tags__db_category", category.lower())) # return self.filter(**dict(query)) - @returns_typeclass_list def get_by_tag(self, key=None, category=None, tagtype=None): """ Return objects having tags with a given key or category or combination of the two. @@ -276,11 +275,13 @@ class TypedObjectManager(idmapper.manager.SharedMemoryManager): if n_keys > 1: if n_categories == 1: category = categories[0] - query = Q(db_tags__db_tagtype=tagtype.lower() if tagtype else tagtype, - db_tags__db_category=category.lower() if category else category, - db_tags__db_model=dbmodel) + query = Q() for key in keys: - query = query & Q(db_tags__db_key=key.lower()) + query = query & \ + Q(db_tags__db_tagtype=tagtype.lower() if tagtype else tagtype, + db_tags__db_category=category.lower() if category else category, + db_tags__db_model=dbmodel, + db_tags__db_key=key.lower()) print "Query:", query else: query = Q(db_tags__db_tagtype=tagtype.lower(),