Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-20 14:56:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Flag list displaying 'None' fixed.

Browse source
This commit is contained in:
Greg Taylor 2009-01-22 15:22:32 +00:00
parent 9403d15ae8
commit cbd5fd9faa
1 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/objects/models.py
View file

@ -392,14 +392,21 @@ class Object(models.Model):
"""
Returns an object's flag list.
"""
flags = self.flags
nosave_flags = self.nosave_flags
if not flags:
flags = ""
if not nosave_flags:
nosave_flags = ""
# Holds the list of flags to display
all_flags = []
if self.flags is not None:
# Add saved flags to the display list
all_flags = all_flags + self.flags.split()
if self.nosave_flags is not None:
# Add non-saved flags to the display list
all_flags = all_flags + self.nosave_flags.split()
return '%s %s' % (flags, nosave_flags)
if not all_flags:
# Guard against returning 'None'
return ""
else:
# Format the Python list to a space separated string of flags
return " ".join(all_flags)
def clear_attribute(self, attribute):
"""
@ -633,7 +640,12 @@ class Object(models.Model):
self.nosave_flags = ' '.join(flags)
else:
# Is a savable flag.
flags = str(self.flags).split()
if self.flags is not None:
flags = str(self.flags).split()
else:
# This prevents conversion of None to strings
flags = []
flags.append(flag)
self.flags = ' '.join(flags)
self.save()