Merge branch 'master' of https://bitbucket.org/lebouquetin/protov1

.gitignore

@@ -12,7 +12,7 @@ build/
 develop-eggs/
 dist/
 eggs/
-lib/
+#lib/
 lib64/
 parts/
 sdist/

pboard/pboard/controllers/api.py

@@ -82,8 +82,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
@@ -99,8 +98,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
@@ -113,8 +111,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
@@ -129,8 +126,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
@@ -224,7 +220,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

@@ -92,17 +92,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
@@ -271,4 +272,4 @@ WHERE
 
   def createRight(self):
     loRight = pbma.Rights()
-    return loRight
+    return loRight