소스 검색

remove random return of a node. note: this break application until associated mako templates are commit

Damien Accorsi 11 년 전
부모
커밋
05d1e10ad3
1개의 변경된 파일4개의 추가작업 그리고 5개의 파일을 삭제
  1. 4 5
      pboard/pboard/lib/dbapi.py

+ 4 - 5
pboard/pboard/lib/dbapi.py 파일 보기

70
 
70
 
71
   def createDummyNode(self):
71
   def createDummyNode(self):
72
     loNewNode = self.createNode()
72
     loNewNode = self.createNode()
73
-    loNewNode.data_label   = 'New document'
74
-    loNewNode.data_content = 'insert content...'
73
+    loNewNode.data_label   = ''
74
+    loNewNode.data_content = ''
75
     return loNewNode
75
     return loNewNode
76
 
76
 
77
 
77
 
78
   def getNode(self, liNodeId):
78
   def getNode(self, liNodeId):
79
     liOwnerIdList = self._getUserIdListForFiltering()
79
     liOwnerIdList = self._getUserIdListForFiltering()
80
-    if liNodeId==0:
81
-      return DBSession.query(pbmd.PBNode).options(joinedload_all("_lAllChildren")).filter(pbmd.PBNode.owner_id.in_(liOwnerIdList)).first()
82
-    else:
80
+    if liNodeId!=0:
83
       return DBSession.query(pbmd.PBNode).options(joinedload_all("_lAllChildren")).filter(pbmd.PBNode.node_id==liNodeId).filter(pbmd.PBNode.owner_id.in_(liOwnerIdList)).one()
81
       return DBSession.query(pbmd.PBNode).options(joinedload_all("_lAllChildren")).filter(pbmd.PBNode.node_id==liNodeId).filter(pbmd.PBNode.owner_id.in_(liOwnerIdList)).one()
82
+    return None
84
 
83
 
85
 
84
 
86
   def getLastModifiedNodes(self, piMaxNodeNb):
85
   def getLastModifiedNodes(self, piMaxNodeNb):