Merge lp:~openerp-dev/openobject-server/6.0-bug-771784-rgo into lp:openobject-server/6.0

[Naresh(OpenERP)]

backport from trunk:revision-info :3391.2.1 <email address hidden>

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Naresh(OpenERP) (nch-openerp)]

This commit on trunk was reverted back @3473:<email address hidden> due to a regression on translation of shortcuts. Then it was decided to remove the editing of shortcuts from the client itself.
so the backport should be made on client from trunk @ 1913 <email address hidden>

I am rejecting this merge proposal !

Thanks,
Naresh

review: Disapprove

Unmerged revisions

3456. By Ravi Gohil (OpenERP) on 2011-06-30

[FIX] base :Editing the shortcut reflects in the view

=== modified file 'bin/addons/base/ir/ir_ui_view.py'
--- bin/addons/base/ir/ir_ui_view.py	2011-04-06 10:05:07 +0000
+++ bin/addons/base/ir/ir_ui_view.py	2012-08-01 05:55:23 +0000
@@ -196,13 +196,10 @@
 
     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))
+        results = self.read(cr, uid, ids, ['res_id','name'], context=context)
+        available_menus = self.pool.get(model).search(cr, uid, [], context=context)
         # 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 filtered_results
+        return filter(lambda result: result['res_id'] in available_menus, results)
 
     _order = 'sequence,name'
     _defaults = {