← Back to team overview

openerp-dev-web team mailing list archive

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

 

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

Requested reviews:
  OpenERP SA's Web Client R&D (openerp-dev-web)
Related bugs:
  Bug #733089 in OpenERP Web Client: "when nested o2m are there. `New` for o2m does not work when o2m-level>1 in first go (when parent is not saved yet)"
  https://bugs.launchpad.net/openobject-client-web/+bug/733089

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

In the case of nested o2m, Button "New" for next o2m does not open by first click.
-- 
https://code.launchpad.net/~openerp-dev/openobject-client-web/trunk-bug-733089-jra/+merge/55726
Your team OpenERP SA's Web Client R&D is requested to review the proposed merge of lp:~openerp-dev/openobject-client-web/trunk-bug-733089-jra into lp:openobject-client-web.
=== modified file 'addons/openerp/controllers/openo2m.py'
--- addons/openerp/controllers/openo2m.py	2011-02-10 16:09:23 +0000
+++ addons/openerp/controllers/openo2m.py	2011-03-31 10:48:32 +0000
@@ -49,6 +49,10 @@
 
         form = tw.form_view.ViewForm(vp, name="view_form", action="/openerp/openo2m/save")
         cherrypy.request.terp_validators = {}
+
+        if '/' in params.o2m:
+            params.o2m = '.'.join(params.o2m.split('/')[-1:])
+
         wid = form.screen.widget.get_widgets_by_name(params.o2m)[0]
 
         # save view_params for later phazes

=== modified file 'addons/openerp/static/javascript/o2m.js'
--- addons/openerp/static/javascript/o2m.js	2011-01-18 20:50:22 +0000
+++ addons/openerp/static/javascript/o2m.js	2011-03-31 10:48:32 +0000
@@ -125,12 +125,11 @@
         var parents = [];
         // get the required view params to get proper view
         var params = {
-            '_terp_view_params/_terp_model': openobject.dom.get('_terp_model').value,
-            '_terp_view_params/_terp_id': openobject.dom.get('_terp_id').value,
-            '_terp_view_params/_terp_ids': openobject.dom.get('_terp_ids').value,
-            '_terp_view_params/_terp_view_ids': openobject.dom.get('_terp_view_ids').value,
-            '_terp_view_params/_terp_view_mode': openobject.dom.get('_terp_view_mode').value,
-            '_terp_view_params/_terp_context': openobject.dom.get('_terp_context').value || {},
+            '_terp_view_params/_terp_model': this.parent_model,
+            '_terp_view_params/_terp_id': this.parent_id,
+            '_terp_view_params/_terp_view_id':this.parent_view_id,
+            '_terp_view_params/_terp_view_mode': this.mode,
+            '_terp_view_params/_terp_context': this.parent_context || {},
             '_terp_view_params/_terp_view_type': 'form'
         };
 


Follow ups