Fixed some lingering issues in TutorialWorld.
This commit is contained in:
parent
bd9421d4b0
commit
88075bf2a0
3 changed files with 18 additions and 17 deletions
|
|
@ -493,11 +493,11 @@ class ObjectDB(TypedObject):
|
||||||
has_player = property(__has_player_get)
|
has_player = property(__has_player_get)
|
||||||
is_player = property(__has_player_get)
|
is_player = property(__has_player_get)
|
||||||
|
|
||||||
##@property
|
#@property
|
||||||
#def __is_superuser_get(self):
|
def __is_superuser_get(self):
|
||||||
# "Check if user has a player, and if so, if it is a superuser."
|
"Check if user has a player, and if so, if it is a superuser."
|
||||||
# return any(_GA(self, "sessions")) and _GA(_GA(self, "player"), "is_superuser")
|
return any(_GA(self, "sessions")) and _GA(_GA(self, "db_player"), "is_superuser")
|
||||||
#is_superuser = property(__is_superuser_get)
|
is_superuser = property(__is_superuser_get)
|
||||||
|
|
||||||
# contents
|
# contents
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -252,7 +252,7 @@ class PlayerDB(TypedObject):
|
||||||
|
|
||||||
# name property (wraps self.user.username)
|
# name property (wraps self.user.username)
|
||||||
#@property
|
#@property
|
||||||
def name_get(self):
|
def __name_get(self):
|
||||||
"Getter. Allows for value = self.name"
|
"Getter. Allows for value = self.name"
|
||||||
name = get_prop_cache(self, "_name")
|
name = get_prop_cache(self, "_name")
|
||||||
if not name:
|
if not name:
|
||||||
|
|
@ -260,41 +260,41 @@ class PlayerDB(TypedObject):
|
||||||
set_prop_cache(self, "_name", name)
|
set_prop_cache(self, "_name", name)
|
||||||
return name
|
return name
|
||||||
#@name.setter
|
#@name.setter
|
||||||
def name_set(self, value):
|
def __name_set(self, value):
|
||||||
"Setter. Allows for player.name = newname"
|
"Setter. Allows for player.name = newname"
|
||||||
_GA(self, "user").username = value
|
_GA(self, "user").username = value
|
||||||
_GA(self, "user").save()
|
_GA(self, "user").save()
|
||||||
set_prop_cache(self, "_name", value)
|
set_prop_cache(self, "_name", value)
|
||||||
#@name.deleter
|
#@name.deleter
|
||||||
def name_del(self):
|
def __name_del(self):
|
||||||
"Deleter. Allows for del self.name"
|
"Deleter. Allows for del self.name"
|
||||||
raise Exception("Player name cannot be deleted!")
|
raise Exception("Player name cannot be deleted!")
|
||||||
name = property(name_get, name_set, name_del)
|
name = property(__name_get, __name_set, __name_del)
|
||||||
key = property(name_get, name_set, name_del)
|
key = property(__name_get, __name_set, __name_del)
|
||||||
|
|
||||||
#@property
|
#@property
|
||||||
def uid_get(self):
|
def __uid_get(self):
|
||||||
"Getter. Retrieves the user id"
|
"Getter. Retrieves the user id"
|
||||||
uid = get_prop_cache(self, "_uid")
|
uid = get_prop_cache(self, "_uid")
|
||||||
if not uid:
|
if not uid:
|
||||||
uid = _GA(self, "user").id
|
uid = _GA(self, "user").id
|
||||||
set_prop_cache(self, "_uid", uid)
|
set_prop_cache(self, "_uid", uid)
|
||||||
return uid
|
return uid
|
||||||
def uid_set(self, value):
|
def __uid_set(self, value):
|
||||||
raise Exception("User id cannot be set!")
|
raise Exception("User id cannot be set!")
|
||||||
def uid_del(self):
|
def __uid_del(self):
|
||||||
raise Exception("User id cannot be deleted!")
|
raise Exception("User id cannot be deleted!")
|
||||||
uid = property(uid_get, uid_set, uid_del)
|
uid = property(__uid_get, __uid_set, __uid_del)
|
||||||
|
|
||||||
#@property
|
#@property
|
||||||
def is_superuser_get(self):
|
def __is_superuser_get(self):
|
||||||
"Superusers have all permissions."
|
"Superusers have all permissions."
|
||||||
is_suser = get_prop_cache(self, "_is_superuser")
|
is_suser = get_prop_cache(self, "_is_superuser")
|
||||||
if is_suser == None:
|
if is_suser == None:
|
||||||
is_suser = _GA(self, "user").is_superuser
|
is_suser = _GA(self, "user").is_superuser
|
||||||
set_prop_cache(self, "_is_superuser", is_suser)
|
set_prop_cache(self, "_is_superuser", is_suser)
|
||||||
return is_suser
|
return is_suser
|
||||||
is_superuser = property(is_superuser_get)
|
is_superuser = property(__is_superuser_get)
|
||||||
|
|
||||||
#
|
#
|
||||||
# PlayerDB class access methods
|
# PlayerDB class access methods
|
||||||
|
|
|
||||||
|
|
@ -86,6 +86,7 @@ class _SaverMutable(object):
|
||||||
self._parent._save_tree()
|
self._parent._save_tree()
|
||||||
elif self._db_obj:
|
elif self._db_obj:
|
||||||
self._db_obj.value = self
|
self._db_obj.value = self
|
||||||
|
else:
|
||||||
logger.log_errmsg("_SaverMutable %s has no root Attribute to save to." % self)
|
logger.log_errmsg("_SaverMutable %s has no root Attribute to save to." % self)
|
||||||
def _convert_mutables(self, data):
|
def _convert_mutables(self, data):
|
||||||
"converts mutables to Saver* variants and assigns .parent property"
|
"converts mutables to Saver* variants and assigns .parent property"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue