浏览代码

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

Damien Accorsi 11 年前
父节点
当前提交
ccddf8793d
共有 3 个文件被更改,包括 14 次插入17 次删除
  1. 1 1
      .gitignore
  2. 5 9
      pboard/pboard/controllers/api.py
  3. 8 7
      pboard/pboard/lib/dbapi.py

+ 1 - 1
.gitignore 查看文件

12
 develop-eggs/
12
 develop-eggs/
13
 dist/
13
 dist/
14
 eggs/
14
 eggs/
15
-lib/
15
+#lib/
16
 lib64/
16
 lib64/
17
 parts/
17
 parts/
18
 sdist/
18
 sdist/

+ 5 - 9
pboard/pboard/controllers/api.py 查看文件

82
       loCurrentUser   = pld.PODStaticController.getCurrentUser()
82
       loCurrentUser   = pld.PODStaticController.getCurrentUser()
83
       loApiController = pld.PODUserFilteredApiController(loCurrentUser.user_id)
83
       loApiController = pld.PODUserFilteredApiController(loCurrentUser.user_id)
84
       
84
       
85
-      loNewNode = loApiController.createNode()
86
-      loNewNode.parent_id     = int(parent_id)
85
+      loNewNode = loApiController.createNode(int(parent_id))
87
       loNewNode.node_type     = pmd.PBNodeType.Event
86
       loNewNode.node_type     = pmd.PBNodeType.Event
88
       loNewNode.data_label    = data_label
87
       loNewNode.data_label    = data_label
89
       loNewNode.data_content  = data_content
88
       loNewNode.data_content  = data_content
99
       loCurrentUser   = pld.PODStaticController.getCurrentUser()
98
       loCurrentUser   = pld.PODStaticController.getCurrentUser()
100
       loApiController = pld.PODUserFilteredApiController(loCurrentUser.user_id)
99
       loApiController = pld.PODUserFilteredApiController(loCurrentUser.user_id)
101
       
100
       
102
-      loNewNode = loApiController.createNode()
103
-      loNewNode.parent_id     = int(parent_id)
101
+      loNewNode = loApiController.createNode(int(parent_id))
104
       loNewNode.node_type     = pmd.PBNodeType.Contact
102
       loNewNode.node_type     = pmd.PBNodeType.Contact
105
       loNewNode.data_label    = data_label
103
       loNewNode.data_label    = data_label
106
       loNewNode.data_content  = data_content
104
       loNewNode.data_content  = data_content
113
       loCurrentUser   = pld.PODStaticController.getCurrentUser()
111
       loCurrentUser   = pld.PODStaticController.getCurrentUser()
114
       loApiController = pld.PODUserFilteredApiController(loCurrentUser.user_id)
112
       loApiController = pld.PODUserFilteredApiController(loCurrentUser.user_id)
115
 
113
 
116
-      loNewNode = loApiController.createNode()
117
-      loNewNode.parent_id     = int(parent_id)
114
+      loNewNode = loApiController.createNode(int(parent_id))
118
       loNewNode.node_type     = pmd.PBNodeType.Comment
115
       loNewNode.node_type     = pmd.PBNodeType.Comment
119
       loNewNode.data_label    = data_label
116
       loNewNode.data_label    = data_label
120
       loNewNode.data_content  = data_content
117
       loNewNode.data_content  = data_content
129
       loCurrentUser   = pld.PODStaticController.getCurrentUser()
126
       loCurrentUser   = pld.PODStaticController.getCurrentUser()
130
       loApiController = pld.PODUserFilteredApiController(loCurrentUser.user_id)
127
       loApiController = pld.PODUserFilteredApiController(loCurrentUser.user_id)
131
       
128
       
132
-      loNewNode = loApiController.createNode()
133
-      loNewNode.parent_id     = int(parent_id)
129
+      loNewNode = loApiController.createNode(int(parent_id))
134
       loNewNode.node_type     = pmd.PBNodeType.File
130
       loNewNode.node_type     = pmd.PBNodeType.File
135
       loNewNode.data_label    = data_label
131
       loNewNode.data_label    = data_label
136
       loNewNode.data_content  = data_content
132
       loNewNode.data_content  = data_content
224
         loParent = loApiController.getNode(parent_id)
220
         loParent = loApiController.getNode(parent_id)
225
         lsNodeName = 'Subdocument of (%s)' % loParent.data_label
221
         lsNodeName = 'Subdocument of (%s)' % loParent.data_label
226
 
222
 
227
-      loNewNode = loApiController.createDummyNode()
223
+      loNewNode = loApiController.createDummyNode(parent_id)
228
       loNewNode.data_label   = lsNodeName
224
       loNewNode.data_label   = lsNodeName
229
       loNewNode.data_content = 'insert content...'
225
       loNewNode.data_content = 'insert content...'
230
 
226
 

+ 8 - 7
pboard/pboard/lib/dbapi.py 查看文件

92
     return self._iUserIdFilteringList
92
     return self._iUserIdFilteringList
93
 
93
 
94
 
94
 
95
-  def createNode(self):
95
+  def createNode(self, parent_id=0):
96
     loNode          = pbmd.PBNode()
96
     loNode          = pbmd.PBNode()
97
     loNode.owner_id = self._iCurrentUserId
97
     loNode.owner_id = self._iCurrentUserId
98
+    loNode.parent_id = parent_id
99
+    parent_rights = DBSession.query(pbma.Rights).filter(pbma.Rights.node_id==parent_id).all()
100
+    loNode.rights = parent_rights
101
+    loNode.rights = [pbma.Rights(group_id=r.group_id, rights=r.rights) for r in parent_rights]
98
     DBSession.add(loNode)
102
     DBSession.add(loNode)
99
     return loNode
103
     return loNode
100
   
104
   
101
-    query.filter(User.name.in_(['ed', 'wendy', 'jack']))
102
-
103
-
104
-  def createDummyNode(self):
105
-    loNewNode = self.createNode()
105
+  def createDummyNode(self, parent_id):
106
+    loNewNode = self.createNode(parent_id)
106
     loNewNode.data_label   = ''
107
     loNewNode.data_label   = ''
107
     loNewNode.data_content = ''
108
     loNewNode.data_content = ''
108
     return loNewNode
109
     return loNewNode
271
 
272
 
272
   def createRight(self):
273
   def createRight(self):
273
     loRight = pbma.Rights()
274
     loRight = pbma.Rights()
274
-    return loRight
275
+    return loRight