From 2a916edbade8505201aba8b520981e9ac26873c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 28 Aug 2012 09:53:21 +0200 Subject: [PATCH] [REVIEW] ir_ui_menu: cleaned _get_needaction code. bzr revid: tde@openerp.com-20120828075321-7emtlqvh5oj6o31r --- openerp/addons/base/ir/ir_ui_menu.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py index 05523faa550..77e923adf48 100644 --- a/openerp/addons/base/ir/ir_ui_menu.py +++ b/openerp/addons/base/ir/ir_ui_menu.py @@ -23,9 +23,7 @@ import base64 import re import threading - from tools.safe_eval import safe_eval as eval - import tools import openerp.modules from osv import fields, osv @@ -258,18 +256,15 @@ class ir_ui_menu(osv.osv): return res def _get_needaction(self, cr, uid, ids, field_names, args, context=None): - if context is None: - context = {} res = {} for menu in self.browse(cr, uid, ids, context=context): - res[menu.id] = {} - res[menu.id]['needaction_enabled'] = False - res[menu.id]['needaction_counter'] = False - res[menu.id] = {} + res[menu.id] = { + 'needaction_enabled': False, + 'needaction_counter': False, + } if menu.action and menu.action.type in ('ir.actions.act_window','ir.actions.client') and menu.action.res_model: obj = self.pool.get(menu.action.res_model) if obj._needaction: - dom = [] if menu.action.type=='ir.actions.act_window': dom = menu.action.domain and eval(menu.action.domain, {'uid': uid}) or [] else: