Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-27 02:06:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add correct use of db_model field to Attributes.

Browse source
This commit is contained in:
Griatch 2017-01-22 17:22:52 +01:00
parent 982b11ddfb
commit b6c2aaedc5
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
evennia/typeclasses/attributes.py
View file

@ -11,7 +11,6 @@ which is a non-db version of Attributes.
from builtins import object
import re
import weakref
from collections import defaultdict
from django.db import models
from django.conf import settings
@ -279,6 +278,7 @@ class AttributeHandler(object):
else:
# we have to query to make this category up-date in the cache
query = {"%s__id" % self._model : self._objid,
"attribute__db_model" : self._model,
"attribute__db_attrtype" : self._attrtype,
"attribute__db_category__iexact" : category.lower() if category else None}
attrs = [conn.attribute for conn in getattr(self.obj,
@ -478,8 +478,10 @@ class AttributeHandler(object):
attr_obj.value = value
else:
# create a new Attribute (no OOB handlers can be notified)
kwargs = {"db_key" : keystr, "db_category" : category,
"db_model" : self._model, "db_attrtype" : self._attrtype,
kwargs = {"db_key" : keystr,
"db_category" : category,
"db_model" : self._model,
"db_attrtype" : self._attrtype,
"db_value" : None if strattr else to_pickle(value),
"db_strvalue" : value if strattr else None}
new_attr = Attribute(**kwargs)
@ -546,7 +548,9 @@ class AttributeHandler(object):
attr_obj.value = new_value
else:
# create a new Attribute (no OOB handlers can be notified)
kwargs = {"db_key" : keystr, "db_category" : category,
kwargs = {"db_key" : keystr,
"db_category" : category,
"db_model": self._model,
"db_attrtype" : self._attrtype,
"db_value" : None if strattr else to_pickle(new_value),
"db_strvalue" : value if strattr else None}

8
evennia/typeclasses/migrations/0006_auto_20170121_2230.py
View file

@ -7,6 +7,14 @@ from django.db import migrations
def update_tags_with_dbmodel(apps, schema_editor):
Tag = apps.get_model('typeclasses', 'Tag')
Attribute = apps.get_model('typeclasses', 'Attribute')
ObjectDB = apps.get_model('objects', 'ObjectDB')
PlayerDB = apps.get_model('players', 'PlayerDB')
ScriptDB = apps.get_model('scripts', 'ScriptDB')
HelpEntry = apps.get_model('help', 'HelpEntry')
Msg = apps.get_model('comms', 'Msg')
class Migration(migrations.Migration):