[MERGE] merge bug fix

- original commit message: [FIX] ir_ui_view.py: get_sc only returns shortcuts for existing menu items. lp bug: https://launchpad.net/bugs/727730 fixed bzr revid: [email protected]
piensom · Apr 6, 2011 · 86bc2a6 · 86bc2a6
2 parents 7f7e771 + b1ffebe
commit 86bc2a6
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/bin/addons/base/ir/ir_ui_view.py b/bin/addons/base/ir/ir_ui_view.py
@@ -198,9 +198,11 @@ def get_sc(self, cr, uid, user_id, model='ir.ui.menu', context=None):
         ids = self.search(cr, uid, [('user_id','=',user_id),('resource','=',model)], context=context)
         results = self.read(cr, uid, ids, ['res_id'], context=context)
         name_map = dict(self.pool.get(model).name_get(cr, uid, [x['res_id'] for x in results], context=context))
-        for result in results:
+        # Make sure to return only shortcuts pointing to exisintg menu items.
+        filtered_results = filter(lambda result: result['res_id'] in name_map, results)
+        for result in filtered_results:
             result.update(name=name_map[result['res_id']])
-        return results
+        return filtered_results
 
     _order = 'sequence,name'
     _defaults = {