From 88075bf2a02c94309d1c908e69622075f0a39336 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 12 May 2013 20:24:00 +0200
Subject: [PATCH] Fixed some lingering issues in TutorialWorld.

---
 src/objects/models.py    | 10 +++++-----
 src/players/models.py    | 22 +++++++++++-----------
 src/utils/dbserialize.py |  3 ++-
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/objects/models.py b/src/objects/models.py
index 995de18cf..47c898858 100644
--- a/src/objects/models.py
+++ b/src/objects/models.py
@@ -493,11 +493,11 @@ class ObjectDB(TypedObject):
     has_player = property(__has_player_get)
     is_player = property(__has_player_get)
 
-    ##@property
-    #def __is_superuser_get(self):
-    #    "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")
-    #is_superuser = property(__is_superuser_get)
+    #@property
+    def __is_superuser_get(self):
+        "Check if user has a player, and if so, if it is a superuser."
+        return any(_GA(self, "sessions")) and _GA(_GA(self, "db_player"), "is_superuser")
+    is_superuser = property(__is_superuser_get)
 
     # contents
 
diff --git a/src/players/models.py b/src/players/models.py
index 96e509c43..278ab00a1 100644
--- a/src/players/models.py
+++ b/src/players/models.py
@@ -252,7 +252,7 @@ class PlayerDB(TypedObject):
 
     # name property (wraps self.user.username)
     #@property
-    def name_get(self):
+    def __name_get(self):
         "Getter. Allows for value = self.name"
         name = get_prop_cache(self, "_name")
         if not name:
@@ -260,41 +260,41 @@ class PlayerDB(TypedObject):
             set_prop_cache(self, "_name", name)
         return name
     #@name.setter
-    def name_set(self, value):
+    def __name_set(self, value):
         "Setter. Allows for player.name = newname"
         _GA(self, "user").username = value
         _GA(self, "user").save()
         set_prop_cache(self, "_name", value)
     #@name.deleter
-    def name_del(self):
+    def __name_del(self):
         "Deleter. Allows for del self.name"
         raise Exception("Player name cannot be deleted!")
-    name = property(name_get, name_set, name_del)
-    key = property(name_get, name_set, name_del)
+    name = property(__name_get, __name_set, __name_del)
+    key = property(__name_get, __name_set, __name_del)
 
     #@property
-    def uid_get(self):
+    def __uid_get(self):
         "Getter. Retrieves the user id"
         uid = get_prop_cache(self, "_uid")
         if not uid:
             uid = _GA(self, "user").id
             set_prop_cache(self, "_uid", uid)
         return uid
-    def uid_set(self, value):
+    def __uid_set(self, value):
         raise Exception("User id cannot be set!")
-    def uid_del(self):
+    def __uid_del(self):
         raise Exception("User id cannot be deleted!")
-    uid = property(uid_get, uid_set, uid_del)
+    uid = property(__uid_get, __uid_set, __uid_del)
 
     #@property
-    def is_superuser_get(self):
+    def __is_superuser_get(self):
         "Superusers have all permissions."
         is_suser = get_prop_cache(self, "_is_superuser")
         if is_suser == None:
             is_suser = _GA(self, "user").is_superuser
             set_prop_cache(self, "_is_superuser", is_suser)
         return is_suser
-    is_superuser = property(is_superuser_get)
+    is_superuser = property(__is_superuser_get)
 
     #
     # PlayerDB class access methods
diff --git a/src/utils/dbserialize.py b/src/utils/dbserialize.py
index ddfaba958..ab4e09361 100644
--- a/src/utils/dbserialize.py
+++ b/src/utils/dbserialize.py
@@ -86,7 +86,8 @@ class _SaverMutable(object):
             self._parent._save_tree()
         elif self._db_obj:
             self._db_obj.value = self
-        logger.log_errmsg("_SaverMutable %s has no root Attribute to save to." % self)
+        else:
+            logger.log_errmsg("_SaverMutable %s has no root Attribute to save to." % self)
     def _convert_mutables(self, data):
         "converts mutables to Saver* variants and assigns .parent property"
         def process_tree(item, parent):