diff options
| author | Harry (Open ERP) <hmo@tinyerp.com> | 2010-03-17 11:31:45 +0530 |
|---|---|---|
| committer | Harry (Open ERP) <hmo@tinyerp.com> | 2010-03-17 11:31:45 +0530 |
| commit | 586a4ef79aa7f87ea55ccc44c727eaffb53c730b (patch) | |
| tree | 9d6e447af4e1662a6eb451fd73a27fecb9599c25 /addons/document/document_directory.py | |
| parent | 0db347d65f9c67f4b114a96874ea120cf7eacdee (diff) | |
| parent | b6b93ef9d0eee59855f509c844bcc1a18e7bbb8d (diff) | |
[MERGE] from lp:~openerp/openobject-addons/trunk/
bzr revid: hmo@tinyerp.com-20100317060145-grxjqr8b90u4nn5d
Diffstat (limited to 'addons/document/document_directory.py')
| -rw-r--r-- | addons/document/document_directory.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py index 1557941e7c6..a04bfce7231 100644 --- a/addons/document/document_directory.py +++ b/addons/document/document_directory.py @@ -215,8 +215,8 @@ class document_directory(osv.osv): path.append(duri[0]) duri = duri[1:] did = nid[0] - - return (nodes.node_dir(path, nparent,ncontext,self.browse(cr,uid,did, context)), duri) + root_node = did and self.browse(cr,uid,did, context) or False + return (nodes.node_dir(path, nparent,ncontext, root_node), duri) nid = self.search(cr,uid,[('parent_id','=',did),('name','=',duri[0]),('type','=','ressource')], context=context) |