merged. Oh no, we have two different user relationship models. Mine's in relations...

[zzz-floof.git] / floof / model / users.py

diff --git a/floof/model/users.py b/floof/model/users.py
index af4bfba..7601cf5 100644 (file)
--- a/floof/model/users.py
+++ b/floof/model/users.py
@@ -22,6 +22,9 @@ class User(Entity):
 
     def __unicode__(self):
         return self.name
 
     def __unicode__(self):
         return self.name

+    
+    def __str__(self):
+        return self.name

 
     def __init__(self, **kwargs):
         super(User, self).__init__(**kwargs)
 
     def __init__(self, **kwargs):
         super(User, self).__init__(**kwargs)


@@ -47,10 +50,9 @@ class UserPage(Entity):
     This is so that they can keep some nice themed pages lying around for special occasions.
     Page templates that provide familiar interfaces will also be UserPage records.  Users will
     see a panel full of them, and they can choose to clone those template pages to their own page list.
     This is so that they can keep some nice themed pages lying around for special occasions.
     Page templates that provide familiar interfaces will also be UserPage records.  Users will
     see a panel full of them, and they can choose to clone those template pages to their own page list.

-    If more than one is set to visible, there would be tabs.
-
-     """
-
+    If more than one is set to visible, there would be tabs.  The primary page is indicated in the user model.
+    """
+    

     owner = ManyToOne('User', inverse="pages")
     title = Field(String)
 
     owner = ManyToOne('User', inverse="pages")
     title = Field(String)
 


@@ -75,3 +77,4 @@ class UserRelationship(Entity):
     user = ManyToOne('User')
     target_user = ManyToOne('User')
     type = Field(Integer)  # UserRelationshipTypes above
     user = ManyToOne('User')
     target_user = ManyToOne('User')
     type = Field(Integer)  # UserRelationshipTypes above

+