From 6d2fac36f6ed8ea847acc9266e0df32b870ad137 Mon Sep 17 00:00:00 2001 From: Christophe Chauvet Date: Sat, 7 Mar 2009 00:50:10 +0100 Subject: [IMP] * add missing tools.translate * translate all missing raise * add encoding: utf-8 in missing file * add vim comment (when missing) at the end of file * convert tabs to spaces (PEP8 Compliant) * more pythonic when concatenate value bzr revid: christophe.chauvet@syleam.fr-20090306235010-kf09klskd2voo5cp --- addons/document/document.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'addons/document/document.py') diff --git a/addons/document/document.py b/addons/document/document.py index e86d90e4643..7138eee77d5 100644 --- a/addons/document/document.py +++ b/addons/document/document.py @@ -38,6 +38,7 @@ import string from psycopg2 import Binary from tools import config import tools +from tools.translate import _ def random_name(): random.seed() @@ -376,14 +377,14 @@ class document_directory(osv.osv): return True def write(self, cr, uid, ids, vals, context=None): if not self._check_duplication(cr,uid,vals,ids,op='write'): - raise osv.except_osv('ValidateError', _('Directory name must be unique!')) + raise osv.except_osv(_('ValidateError'), _('Directory name must be unique!')) return super(document_directory,self).write(cr,uid,ids,vals,context=context) def create(self, cr, uid, vals, context=None): if not self._check_duplication(cr,uid,vals): - raise osv.except_osv('ValidateError', _('Directory name must be unique!')) + raise osv.except_osv(_('ValidateError'), _('Directory name must be unique!')) if vals.get('name',False) and (vals.get('name').find('/')+1 or vals.get('name').find('@')+1 or vals.get('name').find('$')+1 or vals.get('name').find('#')+1) : - raise osv.except_osv('ValidateError', _('Directory name contains special characters!')) + raise osv.except_osv(_('ValidateError'), _('Directory name contains special characters!')) return super(document_directory,self).create(cr, uid, vals, context) document_directory() @@ -516,7 +517,7 @@ class document_file(osv.osv): try: os.makedirs(path) except: - raise except_orm('Permission Denied !', 'You do not permissions to write on the server side.') + raise except_orm(_('Permission Denied !'), _('You do not permissions to write on the server side.')) flag = None # This can be improved @@ -534,7 +535,7 @@ class document_file(osv.osv): cr.execute('update ir_attachment set store_fname=%s,store_method=%s,file_size=%s where id=%s', (os.path.join(flag,filename),'fs',len(v),id)) return True except Exception,e : - raise except_orm('Error!', str(e)) + raise except_orm(_('Error!'), str(e)) _columns = { 'user_id': fields.many2one('res.users', 'Owner', select=1), @@ -598,7 +599,7 @@ class document_file(osv.osv): if not len(res): return False if not self._check_duplication(cr,uid,vals,ids,'write'): - raise except_orm('ValidateError', 'File name must be unique!') + raise except_orm(_('ValidateError'), _('File name must be unique!')) result = super(document_file,self).write(cr,uid,ids,vals,context=context) cr.commit() try: @@ -651,7 +652,7 @@ class document_file(osv.osv): datas=vals.get('datas',False) vals['file_size']= len(datas) if not self._check_duplication(cr,uid,vals): - raise except_orm('ValidateError', 'File name must be unique!') + raise except_orm(_('ValidateError'), _('File name must be unique!')) result = super(document_file,self).create(cr, uid, vals, context) cr.commit() try: -- cgit v1.2.3 From 0f89e23954fe0597e8e745bea2f6818d186737c8 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 31 Mar 2009 01:10:59 +0200 Subject: merge bzr revid: fp@tinyerp.com-20090330231059-axmtdiszz5kpbfpe --- addons/document/document.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'addons/document/document.py') diff --git a/addons/document/document.py b/addons/document/document.py index e86d90e4643..fcd60619a97 100644 --- a/addons/document/document.py +++ b/addons/document/document.py @@ -492,11 +492,11 @@ class document_file(osv.osv): result = {} cr.execute('select id,store_fname,link from ir_attachment where id in ('+','.join(map(str,ids))+')') for id,r,l in cr.fetchall(): - try: - value = file(os.path.join(self._get_filestore(cr), r), 'rb').read() - result[id] = base64.encodestring(value) - except: - result[id]='' + try: + value = file(os.path.join(self._get_filestore(cr), r), 'rb').read() + result[id] = base64.encodestring(value) + except: + result[id]='' if context.get('bin_size', False): result[id] = tools.human_size(len(result[id])) @@ -581,7 +581,7 @@ class document_file(osv.osv): res_id=file.res_id and file.res_id or 0 res=self.search(cr,uid,[('id','<>',file.id),('name','=',name),('parent_id','=',parent_id),('res_model','=',res_model),('res_id','=',res_id)]) if len(res): - return False + return False if op=='create': res=self.search(cr,uid,[('name','=',name),('parent_id','=',parent_id),('res_id','=',res_id),('res_model','=',res_model)]) if len(res): -- cgit v1.2.3 From a2003505242a608ff1f0f305f9f5bd53ec111b14 Mon Sep 17 00:00:00 2001 From: "Harry (Open ERP)" Date: Wed, 8 Apr 2009 14:49:46 +0530 Subject: [DMS]fixed_bug_347877 bzr revid: hmo@tinyerp.com-20090408091946-r9dlpgyon8xhqfhh --- addons/document/document.py | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) (limited to 'addons/document/document.py') diff --git a/addons/document/document.py b/addons/document/document.py index 70ac75bd351..a23842d0063 100644 --- a/addons/document/document.py +++ b/addons/document/document.py @@ -136,7 +136,7 @@ class node_class(object): res = pool.get('document.directory').browse(self.cr, self.uid, ids,self.context) return res - def _child_get(self, nodename=False): + def _child_get(self, nodename=False): if self.type not in ('collection','database'): return [] res = self.directory_list_for_child(nodename) @@ -153,19 +153,8 @@ class node_class(object): result +=map(lambda x: node_class(self.cr, self.uid, self.path+'/'+x.name, x, False, type='file', root=self.root), res) if self.type=='collection' and self.object.type=="ressource": where = self.object.domain and eval(self.object.domain, {'active_id':self.root}) or [] - pool = pooler.get_pool(self.cr.dbname) + pool = pooler.get_pool(self.cr.dbname) obj = pool.get(self.object.ressource_type_id.model) - - if self.object.ressource_tree: - if obj._parent_name in obj.fields_get(self.cr,self.uid): - where.append((obj._parent_name,'=',self.object2 and self.object2.id or False)) - else : - if self.object2: - return result - else: - if self.object2: - return result - name_for = obj._name.split('.')[-1] if nodename and nodename.find(name_for) == 0 : id = int(nodename.replace(name_for,'')) @@ -177,6 +166,22 @@ class node_class(object): if nodename.find(INVALID_CHARS[invalid]) : nodename=nodename.replace(INVALID_CHARS[invalid],invalid) where.append(('name','like',nodename)) + + if self.object.ressource_tree: + if obj._parent_name in obj.fields_get(self.cr,self.uid): + where.append((obj._parent_name,'=',self.object2 and self.object2.id or False)) + ids = obj.search(self.cr, self.uid, where, self.context) + res = obj.browse(self.cr, self.uid, ids,self.context) + result+= map(lambda x: node_class(self.cr, self.uid, self.path+'/'+x.name.replace('/','__'), self.object, x, root=x.id), res) + return result + else : + if self.object2: + return result + else: + if self.object2: + return result + + ids = obj.search(self.cr, self.uid, where, self.context) res = obj.browse(self.cr, self.uid, ids,self.context) for r in res: @@ -184,10 +189,10 @@ class node_class(object): r.name = name_for+'%d'%r.id for invalid in INVALID_CHARS: if r.name.find(invalid) : - r.name=r.name.replace(invalid,INVALID_CHARS[invalid]) - result2 = map(lambda x: node_class(self.cr, self.uid, self.path+'/'+x.name.replace('/','__'), self.object, x, root=r.id), res) + r.name=r.name.replace(invalid,INVALID_CHARS[invalid]) + result2 = map(lambda x: node_class(self.cr, self.uid, self.path+'/'+x.name.replace('/','__'), self.object, x, root=x.id), res) if result2: - result = result2 + result = result2 return result def children(self): -- cgit v1.2.3