From 9d916e684e9f589009c324462430be045cbd44fa Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Mon, 17 Oct 2011 15:37:02 +0200 Subject: [PATCH] [FIX] ir_model.name_search: was incorrectly relying on name_search implementation details As a result, it had been broken by a recent change in the implementation of Model.name_search(). bzr revid: odo@openerp.com-20111017133702-mppmb8w54n6z23ck --- openerp/addons/base/ir/ir_model.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py index 37d6e7a58cc..014d5652891 100644 --- a/openerp/addons/base/ir/ir_model.py +++ b/openerp/addons/base/ir/ir_model.py @@ -124,12 +124,13 @@ class ir_model(osv.osv): # overridden to allow searching both on model name (model field) # and model description (name field) - def name_search(self, cr, uid, name='', args=None, operator='ilike', context=None, limit=None): + def _name_search(self, cr, uid, name='', args=None, operator='ilike', context=None, limit=100, name_get_uid=None): if args is None: args = [] domain = args + ['|', ('model', operator, name), ('name', operator, name)] - return super(ir_model, self).name_search(cr, uid, None, domain, - operator=operator, limit=limit, context=context) + return self.name_get(cr, name_get_uid or uid, + super(ir_model, self).search(cr, uid, domain, limit=limit, context=context), + context=context) def unlink(self, cr, user, ids, context=None):