New nodes inherit parent rights

pboard/pboard/controllers/api.py

@@ -81,8 +81,7 @@ class PODApiController(BaseController):
       loCurrentUser   = pld.PODStaticController.getCurrentUser()
       loApiController = pld.PODUserFilteredApiController(loCurrentUser.user_id)
       
-      loNewNode = loApiController.createNode()
-      loNewNode.parent_id     = int(parent_id)
+      loNewNode = loApiController.createNode(int(parent_id))
       loNewNode.node_type     = pmd.PBNodeType.Event
       loNewNode.data_label    = data_label
       loNewNode.data_content  = data_content
@@ -98,8 +97,7 @@ class PODApiController(BaseController):
       loCurrentUser   = pld.PODStaticController.getCurrentUser()
       loApiController = pld.PODUserFilteredApiController(loCurrentUser.user_id)
       
-      loNewNode = loApiController.createNode()
-      loNewNode.parent_id     = int(parent_id)
+      loNewNode = loApiController.createNode(int(parent_id))
       loNewNode.node_type     = pmd.PBNodeType.Contact
       loNewNode.data_label    = data_label
       loNewNode.data_content  = data_content
@@ -112,8 +110,7 @@ class PODApiController(BaseController):
       loCurrentUser   = pld.PODStaticController.getCurrentUser()
       loApiController = pld.PODUserFilteredApiController(loCurrentUser.user_id)
 
-      loNewNode = loApiController.createNode()
-      loNewNode.parent_id     = int(parent_id)
+      loNewNode = loApiController.createNode(int(parent_id))
       loNewNode.node_type     = pmd.PBNodeType.Comment
       loNewNode.data_label    = data_label
       loNewNode.data_content  = data_content
@@ -128,8 +125,7 @@ class PODApiController(BaseController):
       loCurrentUser   = pld.PODStaticController.getCurrentUser()
       loApiController = pld.PODUserFilteredApiController(loCurrentUser.user_id)
       
-      loNewNode = loApiController.createNode()
-      loNewNode.parent_id     = int(parent_id)
+      loNewNode = loApiController.createNode(int(parent_id))
       loNewNode.node_type     = pmd.PBNodeType.File
       loNewNode.data_label    = data_label
       loNewNode.data_content  = data_content
@@ -223,7 +219,7 @@ class PODApiController(BaseController):
         loParent = loApiController.getNode(parent_id)
         lsNodeName = 'Subdocument of (%s)' % loParent.data_label
 
-      loNewNode = loApiController.createDummyNode()
+      loNewNode = loApiController.createDummyNode(parent_id)
       loNewNode.data_label   = lsNodeName
       loNewNode.data_content = 'insert content...'
 

pboard/pboard/lib/dbapi.py

@@ -76,17 +76,18 @@ class PODUserFilteredApiController(object):
     return self._iUserIdFilteringList
 
 
-  def createNode(self):
+  def createNode(self, parent_id=0):
     loNode          = pbmd.PBNode()
     loNode.owner_id = self._iCurrentUserId
+    loNode.parent_id = parent_id
+    parent_rights = DBSession.query(pbma.Rights).filter(pbma.Rights.node_id==parent_id).all()
+    loNode.rights = parent_rights
+    loNode.rights = [pbma.Rights(group_id=r.group_id, rights=r.rights) for r in parent_rights]
     DBSession.add(loNode)
     return loNode
   
-    query.filter(User.name.in_(['ed', 'wendy', 'jack']))
-
-
-  def createDummyNode(self):
-    loNewNode = self.createNode()
+  def createDummyNode(self, parent_id):
+    loNewNode = self.createNode(parent_id)
     loNewNode.data_label   = ''
     loNewNode.data_content = ''
     return loNewNode

pboard/pboard/model/auth.py

@@ -68,7 +68,6 @@ class Group(DeclarativeBase):
     personnal_group = Column(Boolean)
     users = relation('User', secondary=user_group_table, backref='groups')
 
-    users = relation('User', secondary=user_group_table, backref='groups')
     _lRights = relationship('Rights', remote_side=[Rights.group_id], backref='_oGroup')
 
     def __repr__(self):