diff options
| author | Olivier Dony <odo@openerp.com> | 2013-10-16 13:06:21 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2013-10-16 13:06:21 +0200 |
| commit | 77caeeeba56d404a2dab1ac6c67a3a7f6419fb3a (patch) | |
| tree | 633751334b317c970ca246adca7e7bf27249f322 | |
| parent | 7cb7405ffd36be31e8fbb2070be3252b4af8dfe7 (diff) | |
| parent | 06b2ce213ce6f0bd99e2d11345a0047066af2c74 (diff) | |
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5101 rev-id: odo@openerp.com-20131016105812-844cd9xljvkjwtm3
bzr revid: odo@openerp.com-20131016110621-36vvlpn8dgsabyt1
| -rw-r--r-- | openerp/addons/base/ir/ir_attachment.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/openerp/addons/base/ir/ir_attachment.py b/openerp/addons/base/ir/ir_attachment.py index f00cc3f85ed..2d2e079f804 100644 --- a/openerp/addons/base/ir/ir_attachment.py +++ b/openerp/addons/base/ir/ir_attachment.py @@ -261,10 +261,14 @@ class ir_attachment(osv.osv): return len(result) if count else list(result) def read(self, cr, uid, ids, fields_to_read=None, context=None, load='_classic_read'): + if isinstance(ids, (int, long)): + ids = [ids] self.check(cr, uid, ids, 'read', context=context) return super(ir_attachment, self).read(cr, uid, ids, fields_to_read, context, load) def write(self, cr, uid, ids, vals, context=None): + if isinstance(ids, (int, long)): + ids = [ids] self.check(cr, uid, ids, 'write', context=context, values=vals) if 'file_size' in vals: del vals['file_size'] @@ -275,6 +279,8 @@ class ir_attachment(osv.osv): return super(ir_attachment, self).copy(cr, uid, id, default, context) def unlink(self, cr, uid, ids, context=None): + if isinstance(ids, (int, long)): + ids = [ids] self.check(cr, uid, ids, 'unlink', context=context) location = self.pool.get('ir.config_parameter').get_param(cr, uid, 'ir_attachment.location') if location: |