Naresh(OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/6.0-bug-771784-rgo into
lp:openobject-server/6.0.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
Bug #771784 in OpenERP Server: "[6.0.2]shortcuts - do not display modified
name"
https://bugs.launchpad.net/openobject-server/+bug/771784
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/6.0-bug-771784-rgo/+merge/117570
backport from trunk:revision-info :3391.2.1
[email protected]
--
https://code.launchpad.net/~openerp-dev/openobject-server/6.0-bug-771784-rgo/+merge/117570
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/6.0-bug-771784-rgo.
=== 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 = {
_______________________________________________
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
