# HG changeset patch
# User Sverre Rabbelier <srabbelier@gmail.com>
# Date 1233788496 0
# Node ID 365b4a2df40d403eefb1dd5fd79251bdb0a4f18d
# Parent  1b64b59222270c54e6724ce40b3516f0cceec77b
Make toDict "dereference" the 'name' property if it is present

This makes it possible to turn 'name' into a consistent alias that
can be used to represent an entity.

Patch by: Sverre Rabbelier

diff -r 1b64b5922227 -r 365b4a2df40d app/soc/models/base.py
--- a/app/soc/models/base.py	Wed Feb 04 22:52:33 2009 +0000
+++ b/app/soc/models/base.py	Wed Feb 04 23:01:36 2009 +0000
@@ -53,13 +53,19 @@
     """
 
     result = {}
+    props = self.properties()
 
-    for key, value in self.properties().iteritems():
+    for key, value in props.iteritems():
       # Skip everything but StringProperties
       if not isinstance(value, db.StringProperty):
         continue
       result[key] = getattr(self, key)
 
+    if hasattr(self, 'name'):
+      name_prop = getattr(self, 'name')
+      if callable(name_prop):
+        result['name'] = name_prop()
+
     return result
 
   @classmethod