← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-dev/openobject-client-web/trunk-bug-744080-jra into lp:openobject-client-web

 

Jiten (OpenERP) has proposed merging lp:~openerp-dev/openobject-client-web/trunk-bug-744080-jra into lp:openobject-client-web.

Requested reviews:
  OpenERP SA's Web Client R&D (openerp-dev-web)
Related bugs:
  Bug #744080 in OpenERP Web Client: "don't see any shortcut but they already extist"
  https://bugs.launchpad.net/openobject-client-web/+bug/744080

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client-web/trunk-bug-744080-jra/+merge/56107

This merge proposal is only for trunk branch.
It is not supported with stable code due to different code of both branches.

I will create another merge proposal for stable too.
-- 
https://code.launchpad.net/~openerp-dev/openobject-client-web/trunk-bug-744080-jra/+merge/56107
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-client-web/trunk-bug-744080-jra.
=== modified file 'addons/openerp/controllers/shortcuts.py'
--- addons/openerp/controllers/shortcuts.py	2011-02-10 16:09:23 +0000
+++ addons/openerp/controllers/shortcuts.py	2011-04-04 07:37:25 +0000
@@ -47,6 +47,9 @@
         return shortcuts
 
     def list(self):
+        shortcuts = rpc.RPCProxy('ir.ui.view_sc')\
+            .get_sc(rpc.get_session().uid, 'ir.ui.menu', rpc.get_session().context) or []
+        cherrypy.session['terp_shortcuts'] = shortcuts
         return cherrypy.session.get('terp_shortcuts', [])
 
     def by_res_id(self):


Follow ups