Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make get_attribute/tag manager methods return querysets

Browse source
This commit is contained in:
Griatch 2018-03-01 21:56:40 +01:00
parent 1f1b355263
commit 047e9f619a
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
evennia/typeclasses/managers.py
View file

@ -68,7 +68,9 @@ class TypedObjectManager(idmapper.manager.SharedMemoryManager):
elif value: elif value:
# strvalue and value are mutually exclusive # strvalue and value are mutually exclusive
query.append(("attribute__db_value", value)) query.append(("attribute__db_value", value))
return [th.attribute for th in self.model.db_attributes.through.objects.filter(**dict(query))] return Attribute.objects.filter(
pk__in=self.model.db_attributes.through.objects.filter(
**dict(query)).values_list("attribute_id", flat=True))
def get_nick(self, key=None, category=None, value=None, strvalue=None, obj=None): def get_nick(self, key=None, category=None, value=None, strvalue=None, obj=None):
""" """
@ -190,7 +192,9 @@ class TypedObjectManager(idmapper.manager.SharedMemoryManager):
query.append(("tag__db_key", key)) query.append(("tag__db_key", key))
if category: if category:
query.append(("tag__db_category", category)) query.append(("tag__db_category", category))
return [th.tag for th in self.model.db_tags.through.objects.filter(**dict(query))] return Tag.objects.filter(
pk__in=self.model.db_tags.through.objects.filter(
**dict(query)).values_list("tag_id", flat=True))
def get_permission(self, key=None, category=None, obj=None): def get_permission(self, key=None, category=None, obj=None):
""" """