From bc156c64e4786ea30f07cb851b5f85e4b483b0e7 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 9 Nov 2010 14:21:37 +0100 Subject: [PATCH] [IMP] remove redundancy in ir_values.set bzr revid: xmo@openerp.com-20101109132137-nmkg6uc5sdqovu1o --- bin/addons/base/ir/ir_values.py | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/bin/addons/base/ir/ir_values.py b/bin/addons/base/ir/ir_values.py index 7c519551a0c..21ee1a66f93 100644 --- a/bin/addons/base/ir/ir_values.py +++ b/bin/addons/base/ir/ir_values.py @@ -114,25 +114,19 @@ class ir_values(osv.osv): else: res_id=False if replace: + search_criteria = [ + ('key', '=', key), + ('key2', '=', key2), + ('model', '=', model), + ('res_id', '=', res_id), + ('user_id', '=', preserve_user and uid) + ] if key in ('meta', 'default'): - ids = self.search(cr, uid, [ - ('key', '=', key), - ('key2', '=', key2), - ('name', '=', name), - ('model', '=', model), - ('res_id', '=', res_id), - ('user_id', '=', preserve_user and uid) - ]) + search_criteria.append(('name', '=', name)) else: - ids = self.search(cr, uid, [ - ('key', '=', key), - ('key2', '=', key2), - ('value', '=', value), - ('model', '=', model), - ('res_id', '=', res_id), - ('user_id', '=', preserve_user and uid) - ]) - self.unlink(cr, uid, ids) + search_criteria.append(('value', '=', value)) + + self.unlink(cr, uid, self.search(cr, uid, search_criteria)) vals = { 'name': name, 'value': value,