pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Document: use the new move_to() api, protect setting of file_size.

Browse Source 
bzr revid: p_christ@hol.gr-20100701175133-9prni6r0kspt27ku
This commit is contained in:
P. Christeas
2010-07-01 20:51:33 +03:00
parent 0153d03c82
commit 2c5082001e
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/document/document.py
+12 -5
View File
@@ -159,12 +159,13 @@ class document_file(osv.osv):
nctx = nodes.get_node_context(cr,uid,context)
dirobj = self.pool.get('document.directory')
dbro = dirobj.browse(cr, uid, vals['parent_id'], context=context)
dnode = nctx.get_dir_node(cr, dbro)
ids2 = []
result = False
for fbro in self.browse(cr, uid, ids, context=context):
if fbro.parent_id.id != vals['parent_id']:
fnode = nodes.node_file(None,None,nctx,fbro)
res = fnode.move_to(cr, fbro, dbro, True)
fnode = nctx.get_file_node(cr, fbro)
res = fnode.move_to(cr, dnode, fbro, dbro, True)
if isinstance(res, dict):
vals2 = vals.copy()
vals2.update(res)
@@ -176,9 +177,11 @@ class document_file(osv.osv):
elif res == False:
pass
ids = ids2
if 'file_size' in vals: # only write that field using direct SQL calls
del vals['file_size']
if len(ids):
result = super(document_file,self).write(cr, uid, ids, vals, context=context)
cr.commit()
cr.commit() # ?
return result
def create(self, cr, uid, vals, context=None):
@@ -219,11 +222,15 @@ class document_file(osv.osv):
else:
datas = vals.get('datas', False)
vals['file_size'] = datas and len(datas) or 0
if datas:
vals['file_size'] = len(datas)
else:
if vals.get('file_size'):
del vals['file_size']
if not self._check_duplication(cr, uid, vals):
raise osv.except_osv(_('ValidateError'), _('File name must be unique!'))
result = super(document_file, self).create(cr, uid, vals, context)
cr.commit()
cr.commit() # ?
return result
def unlink(self, cr, uid, ids, context={}):