From 65ae50792394464228fd54066cafa56fbfe13dd2 Mon Sep 17 00:00:00 2001 From: "Ysa (Open ERP)" Date: Wed, 10 Mar 2010 16:23:34 +0530 Subject: [PATCH] [IMP] document :- docuemnt parent_id retrun False instead of None, and improvement in content_index file bzr revid: ysa@tinyerp.co.in-20100310105334-arawdstqdjeiqmtf --- addons/document/content_index.py | 3 ++- addons/document/document_directory.py | 6 +++--- addons/document/nodes.py | 5 +++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/addons/document/content_index.py b/addons/document/content_index.py index 9fc0023e833..9e47621b4c3 100644 --- a/addons/document/content_index.py +++ b/addons/document/content_index.py @@ -158,7 +158,8 @@ class contentIndex(): os.write(fd, content) os.close(fd) - fp = Popen(['file','-b','--mime-type',fname], shell=False, stdout=PIPE).stdout + #fp = Popen(['file','-b','--mime-type',fname], shell=False, stdout=PIPE).stdout + fp = Popen(['file','-b',fname], shell=False, stdout=PIPE).stdout result = fp.read() fp.close() mime2 = result.strip() diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py index bcb86d589d2..17c3dfb66d9 100644 --- a/addons/document/document_directory.py +++ b/addons/document/document_directory.py @@ -65,14 +65,14 @@ class document_directory(osv.osv): objid=self.pool.get('ir.model.data') try: mid = objid._get_id(cr, uid, 'document', 'dir_root') - return None # TODO: check why not display root dir + return False # TODO: check why not display root dir if not mid: - return None + return False except Exception, e: import netsvc logger = netsvc.Logger() logger.notifyChannel("document", netsvc.LOG_WARNING, 'Cannot set directory root:'+ str(e)) - return None + return False return objid.browse(cr, uid, mid, context=context).res_id def _get_def_storage(self,cr,uid,context=None): diff --git a/addons/document/nodes.py b/addons/document/nodes.py index c6e2f1b10d1..13bd1784562 100644 --- a/addons/document/nodes.py +++ b/addons/document/nodes.py @@ -631,6 +631,11 @@ class node_file(node_class): the browse object. """ # this is where storage kicks in.. stor = self.storage_id + if not stor: + data_obj = self.context._dirobj.pool.get('ir.model.data') + data_id = data_obj._get_id(cr, self.context.uid, 'document', 'storage_db') + if data_id: + stor = data_obj.browse(cr, self.context.uid, data_id, context=self.context.context).res_id assert stor stobj = self.context._dirobj.pool.get('document.storage') return stobj.set_data(cr,self.context.uid,stor, self, data, self.context.context, fil_obj)