Naresh(OpenERP) has proposed merging 
lp:~openerp-dev/openobject-server/trunk-bug-798643-nch into 
lp:openobject-server.

Requested reviews:
  Vo Minh Thu (OpenERP) (vmt-openerp)
Related bugs:
  Bug #798643 in OpenERP Server: "[PS] Shortcuts are not translated even if 
current language is FR"
  https://bugs.launchpad.net/openobject-server/+bug/798643

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-798643-nch/+merge/65764

Hello,

Shortcuts are reverted back to their original state i.e translatable because we 
removed the possibility of editing the shortcuts from the client.


Thanks,
-- 
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-798643-nch/+merge/65764
Your team OpenERP R&D Team is subscribed to branch 
lp:~openerp-dev/openobject-server/trunk-bug-798643-nch.
=== modified file 'openerp/addons/base/ir/ir_ui_view.py'
--- openerp/addons/base/ir/ir_ui_view.py	2011-06-01 10:52:09 +0000
+++ openerp/addons/base/ir/ir_ui_view.py	2011-06-24 05:50:55 +0000
@@ -197,10 +197,13 @@
 
     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','name'], context=context)
-        available_menus = self.pool.get(model).search(cr, uid, [], 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))
         # Make sure to return only shortcuts pointing to exisintg menu items.
-        return filter(lambda result: result['res_id'] in available_menus, results)
+        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
 
     _order = 'sequence,name'
     _defaults = {

_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help   : https://help.launchpad.net/ListHelp

Reply via email to