Odoo Web Client

Merge lp:~openerp-dev/openobject-client-web/Add_shortcut_icon into lp:openobject-client-web/trunk

  1. Add_shortcut_icon
  2. Merge into trunk
Proposed by Jiten (OpenERP)
Status: Merged
Merged at revision: 3924
Proposed branch: lp:~openerp-dev/openobject-client-web/Add_shortcut_icon
Merge into: lp:openobject-client-web/trunk
Diff against target: 17 lines (+4/-3)
1 file modified
addons/openerp/controllers/form.py (+4/-3)
To merge this branch: bzr merge lp:~openerp-dev/openobject-client-web/Add_shortcut_icon
Reviewer Review Type Date Requested Status
OpenERP R&D Web Team Pending
Review via email: mp+41457@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/openerp/controllers/form.py'
2--- addons/openerp/controllers/form.py 2010-11-18 14:11:28 +0000
3+++ addons/openerp/controllers/form.py 2010-11-22 13:15:29 +0000
4@@ -1131,9 +1131,10 @@
5 def can_shortcut_create(self):
6 return (rpc.session.is_logged() and
7 rpc.session.active_id and
8- (cherrypy.request.path_info == '/openerp/tree/open' and cherrypy.request.params.get('model') == 'ir.ui.menu')
9- or
10- (cherrypy.request.path_info == '/openerp/form/switch')
11+ (cherrypy.request.path_info == '/openerp/execute' or
12+ cherrypy.request.path_info == '/openerp/form/switch') or
13+ (cherrypy.request.params.get('model') and
14+ cherrypy.request.path_info == '/openerp/form/edit')
15 )
16
17 @expose()