Odoo Web Client

Merge lp:~openerp-dev/openobject-client-web/trunk-bug-733089-jra into lp:openobject-client-web/trunk

  1. trunk-bug-733089-jra
  2. Merge into trunk
Proposed by Jiten (OpenERP)
Status: Merged
Approved by: Xavier (Open ERP)
Approved revision: 4635
Merged at revision: 4635
Proposed branch: lp:~openerp-dev/openobject-client-web/trunk-bug-733089-jra
Merge into: lp:openobject-client-web/trunk
Diff against target: 35 lines (+9/-6)
2 files modified
addons/openerp/controllers/openo2m.py (+4/-0)
addons/openerp/static/javascript/o2m.js (+5/-6)
To merge this branch: bzr merge lp:~openerp-dev/openobject-client-web/trunk-bug-733089-jra
Reviewer Review Type Date Requested Status
OpenERP R&D Web Team Pending
Review via email: mp+55726@code.launchpad.net

Description of the change

In the case of nested o2m, Button "New" for next o2m does not open by first click.

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/openo2m.py'
2--- addons/openerp/controllers/openo2m.py 2011-02-10 16:09:23 +0000
3+++ addons/openerp/controllers/openo2m.py 2011-03-31 10:48:32 +0000
4@@ -49,6 +49,10 @@
5
6 form = tw.form_view.ViewForm(vp, name="view_form", action="/openerp/openo2m/save")
7 cherrypy.request.terp_validators = {}
8+
9+ if '/' in params.o2m:
10+ params.o2m = '.'.join(params.o2m.split('/')[-1:])
11+
12 wid = form.screen.widget.get_widgets_by_name(params.o2m)[0]
13
14 # save view_params for later phazes
15
16=== modified file 'addons/openerp/static/javascript/o2m.js'
17--- addons/openerp/static/javascript/o2m.js 2011-01-18 20:50:22 +0000
18+++ addons/openerp/static/javascript/o2m.js 2011-03-31 10:48:32 +0000
19@@ -125,12 +125,11 @@
20 var parents = [];
21 // get the required view params to get proper view
22 var params = {
23- '_terp_view_params/_terp_model': openobject.dom.get('_terp_model').value,
24- '_terp_view_params/_terp_id': openobject.dom.get('_terp_id').value,
25- '_terp_view_params/_terp_ids': openobject.dom.get('_terp_ids').value,
26- '_terp_view_params/_terp_view_ids': openobject.dom.get('_terp_view_ids').value,
27- '_terp_view_params/_terp_view_mode': openobject.dom.get('_terp_view_mode').value,
28- '_terp_view_params/_terp_context': openobject.dom.get('_terp_context').value || {},
29+ '_terp_view_params/_terp_model': this.parent_model,
30+ '_terp_view_params/_terp_id': this.parent_id,
31+ '_terp_view_params/_terp_view_id':this.parent_view_id,
32+ '_terp_view_params/_terp_view_mode': this.mode,
33+ '_terp_view_params/_terp_context': this.parent_context || {},
34 '_terp_view_params/_terp_view_type': 'form'
35 };
36