odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[REF] Cleanup ir_model_data._unlink 

bzr revid: jth@openerp.com-20100402081546-deiqbx40q2hkucck
This commit is contained in:
Julien Thewys 2010-04-02 10:15:46 +02:00
parent 336f0e40a4
commit 3f8b66799f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/addons/base/ir/ir_model.py
View File

@ -548,10 +548,10 @@ class ir_model_data(osv.osv):
table.replace('.', '_'))] = (table, inherit_id)
return res_id
def _unlink(self, cr, uid, model, ids, direct=False):
for id in ids:
self.unlink_mark[(model, id)]=False
cr.execute('delete from ir_model_data where res_id=%s and model=%s', (id, model))
def _unlink(self, cr, uid, model, res_ids):
for res_id in res_ids:
self.unlink_mark[(model, res_id)] = False
cr.execute('delete from ir_model_data where res_id=%s and model=%s', (res_id, model))
return True
def ir_set(self, cr, uid, key, key2, name, models, value, replace=True, isobject=False, meta=None, xml_id=False):

2
bin/tools/convert.py
View File

@ -251,7 +251,7 @@ form: module.record_id""" % (xml_id,)
pass
if ids:
self.pool.get(d_model).unlink(cr, self.uid, ids)
self.pool.get('ir.model.data')._unlink(cr, self.uid, d_model, ids, direct=True)
self.pool.get('ir.model.data')._unlink(cr, self.uid, d_model, ids)
def _tag_report(self, cr, rec, data_node=None):
res = {}

2
bin/tools/yaml_import.py
View File

@ -541,7 +541,7 @@ class YamlInterpreter(object):
ids = [self.get_id(node.id)]
if len(ids):
self.pool.get(node.model).unlink(self.cr, self.uid, ids)
self.pool.get('ir.model.data')._unlink(self.cr, self.uid, node.model, ids, direct=True)
self.pool.get('ir.model.data')._unlink(self.cr, self.uid, node.model, ids)
def process_url(self, node):
self.validate_xml_id(node.id)