From d6a006028e116ba6d724d44c8ccc4449df974e68 Mon Sep 17 00:00:00 2001 From: Adil Houmadi Date: Tue, 30 Jun 2015 11:56:38 +0200 Subject: [PATCH] [FIX] : make sure that the menu still exists in odoo [IMP] : simplify the code --- web_shortcuts/model/web_shortcut.py | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/web_shortcuts/model/web_shortcut.py b/web_shortcuts/model/web_shortcut.py index aea9938e..acc4521e 100644 --- a/web_shortcuts/model/web_shortcut.py +++ b/web_shortcuts/model/web_shortcut.py @@ -39,14 +39,17 @@ class web_shortcut(models.Model): @api.model def get_user_shortcuts(self, user_id): shortcuts = self.search([('user_id', '=', user_id)]) - results = shortcuts.read(['menu_id']) - ir_ui_menu_obj = self.env['ir.ui.menu'] - menus = ir_ui_menu_obj.search([('id', 'in', [x['menu_id'][0] - for x in results])]) - name_map = dict(menus.name_get()) - # Make sure to return only shortcuts pointing to existing menu items. - filtered_results = filter(lambda result: result['menu_id'][0] in - name_map, results) - for result in filtered_results: - result.update(name=name_map[result['menu_id'][0]]) - return filtered_results + res = [] + for shortcut in shortcuts: + if shortcut.menu_id: + _name = shortcut.menu_id.name_get() + _name = _name[0][1] if len(_name) else '' + _id = shortcut.menu_id.id + res.append( + { + 'id': shortcut.id, + 'name': _name, + 'menu_id': (_id, _name) + } + ) + return res