diff options
| author | Antonin Bourguignon <abo@openerp.com> | 2012-08-24 10:58:01 +0200 |
|---|---|---|
| committer | Antonin Bourguignon <abo@openerp.com> | 2012-08-24 10:58:01 +0200 |
| commit | 85dffc18df45b1dcbe7c0d1a42dd7ee82967fafc (patch) | |
| tree | 0b4a0045b322dd98da918537d00daae2988c1ce1 | |
| parent | b28a9562482a8e9837f3a79093354b767d32c07d (diff) | |
| parent | b218f74b288c99923c5c50b7a628f51d2478c34d (diff) | |
[MERGE] latest trunk
bzr revid: abo@openerp.com-20120824085801-0tr9lajdtiwtpvwr
| -rw-r--r-- | openerp/addons/base/ir/ir_model_constraint.py | 4 | ||||
| -rw-r--r-- | openerp/addons/base/ir/ir_model_relation.py | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/openerp/addons/base/ir/ir_model_constraint.py b/openerp/addons/base/ir/ir_model_constraint.py index 4a69bc2f0a7..a3099339131 100644 --- a/openerp/addons/base/ir/ir_model_constraint.py +++ b/openerp/addons/base/ir/ir_model_constraint.py @@ -45,7 +45,6 @@ class ir_model_constraint(Model): ids_set = set(ids) ids.sort() ids.reverse() - to_unlink = [] for data in self.browse(cr, uid, ids, context): model = data.model.model model_obj = self.pool.get(model) @@ -75,5 +74,4 @@ class ir_model_constraint(Model): cr.execute('ALTER TABLE "%s" DROP CONSTRAINT "%s"' % (model_obj._table, name),) _logger.info('Dropped CONSTRAINT %s@%s', name, model) - to_unlink.append(data.id) - self.unlink(cr, uid, to_unlink, context) + self.unlink(cr, uid, ids, context) diff --git a/openerp/addons/base/ir/ir_model_relation.py b/openerp/addons/base/ir/ir_model_relation.py index eede6eae44f..fc6dae2ca52 100644 --- a/openerp/addons/base/ir/ir_model_relation.py +++ b/openerp/addons/base/ir/ir_model_relation.py @@ -36,7 +36,6 @@ class ir_model_relation(Model): to_drop_table = [] ids.sort() ids.reverse() - to_unlink = [] for data in self.browse(cr, uid, ids, context): model = data.model model_obj = self.pool.get(model) @@ -53,9 +52,7 @@ class ir_model_relation(Model): if cr.fetchone() and not name in to_drop_table: to_drop_table.append(name) - to_unlink.append(data.id) - - self.unlink(cr, uid, to_unlink, context) + self.unlink(cr, uid, ids, context) # drop m2m relation tables for table in to_drop_table: |