diff options
| author | Harry (Open ERP) <hmo@tinyerp.com> | 2009-01-01 15:55:30 +0530 |
|---|---|---|
| committer | Harry (Open ERP) <hmo@tinyerp.com> | 2009-01-01 15:55:30 +0530 |
| commit | 4f9faa7f009a1298d4a45e7bcaeab028426a565c (patch) | |
| tree | e37ada5671d99e3ccee8d5e9a90a323360ec56e1 /addons/document/document.py | |
| parent | f7bc0a3ad1f3de9167c94b5eab709db02adea833 (diff) | |
fixed bug : display content if static directiory
bzr revid: hmo@tinyerp.com-20090101102530-6fa7wv1e8bguhsvy
Diffstat (limited to 'addons/document/document.py')
| -rw-r--r-- | addons/document/document.py | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/addons/document/document.py b/addons/document/document.py index 3d0b0176dce..5a0a3cefb0f 100644 --- a/addons/document/document.py +++ b/addons/document/document.py @@ -87,27 +87,28 @@ class node_class(object): if self.object2: where.append( ('res_model','=',self.object2._name) ) where.append( ('res_id','=',self.object2.id) ) - for content in self.object.content_ids: - if self.object2 or not content.include_name: - if content.include_name: - test_nodename = self.object2.name + (content.suffix or '') + (content.extension or '') - else: - test_nodename = (content.suffix or '') + (content.extension or '') - if test_nodename.find('/'): - test_nodename=test_nodename.replace('/', '_') - path = self.path+'/'+test_nodename - if not nodename: - n = node_class(self.cr, self.uid,path, self.object2, False, content=content, type='content', root=False) - res2.append( n) - else: - if nodename == test_nodename: - n = node_class(self.cr, self.uid, path, self.object2, False, content=content, type='content', root=False) - res2.append(n) else: where.append( ('parent_id','=',self.object.id) ) where.append( ('res_id','=',False) ) if nodename: - where.append( (fobj._rec_name,'like',nodename) ) + where.append( (fobj._rec_name,'like',nodename) ) + for content in self.object.content_ids: + if self.object2 or not content.include_name: + if content.include_name: + test_nodename = self.object2.name + (content.suffix or '') + (content.extension or '') + else: + test_nodename = (content.suffix or '') + (content.extension or '') + if test_nodename.find('/'): + test_nodename=test_nodename.replace('/', '_') + path = self.path+'/'+test_nodename + if not nodename: + n = node_class(self.cr, self.uid,path, self.object2, False, content=content, type='content', root=False) + res2.append( n) + else: + if nodename == test_nodename: + n = node_class(self.cr, self.uid, path, self.object2, False, content=content, type='content', root=False) + res2.append(n) + ids = fobj.search(self.cr, self.uid, where+[ ('parent_id','=',self.object and self.object.id or False) ], context=self.context) if self.object and self.root and (self.object.type=='ressource'): ids += fobj.search(self.cr, self.uid, where+[ ('parent_id','=',False) ], context=self.context) |