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

Fix a bug with creating tags with the db_model property. Resolves #1170.

Browse source
This commit is contained in:
Griatch 2017-01-21 22:19:41 +01:00
parent 6e5c584e18
commit 55e9a01790
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
evennia/typeclasses/managers.py
View file

@ -217,7 +217,7 @@ class TypedObjectManager(idmapper.manager.SharedMemoryManager):
return _Tag.objects.filter(**dict(query)) return _Tag.objects.filter(**dict(query))
else: else:
# search only among tags stored on on this model # search only among tags stored on on this model
query = [("tag__db_tagtype", tagtype)] query = [("tag__db_tagtype", tagtype), ("tag__db_model", dbmodel)]
if obj: if obj:
query.append(("%s__id" % self.model.__name__.lower(), obj.id)) query.append(("%s__id" % self.model.__name__.lower(), obj.id))
if key: if key:
@ -336,7 +336,8 @@ class TypedObjectManager(idmapper.manager.SharedMemoryManager):
data = str(data) if data is not None else None data = str(data) if data is not None else None
# try to get old tag # try to get old tag
tag = self.get_tag(key=key, category=category, tagtype=tagtype, global_search=True) tag = self.get_tag(key=key, category=category, tagtype=tagtype,
dbmodel=dbmodel, global_search=True)
if tag and data is not None: if tag and data is not None:
# get tag from list returned by get_tag # get tag from list returned by get_tag
tag = tag[0] tag = tag[0]