← Back to team overview

openerp-dev-web team mailing list archive

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

 

vda(Open ERP) has proposed merging lp:~openerp-dev/openobject-client-web/trunk-bug-714557-vda into lp:openobject-client-web.

Requested reviews:
  OpenERP SA's Web Client R&D (openerp-dev-web)
Related bugs:
  #714557 Cant create new tasks in Project->Long Term Planning->Plannings->New->Time Encoding
  https://bugs.launchpad.net/bugs/714557

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client-web/trunk-bug-714557-vda/+merge/50701

When o2m found in inline editor overwrite edit_inline property.
So make them editable in popup.
-- 
https://code.launchpad.net/~openerp-dev/openobject-client-web/trunk-bug-714557-vda/+merge/50701
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-client-web/trunk-bug-714557-vda.
=== modified file 'addons/openerp/widgets/listgrid.py'
--- addons/openerp/widgets/listgrid.py	2011-02-15 09:04:57 +0000
+++ addons/openerp/widgets/listgrid.py	2011-02-22 06:34:57 +0000
@@ -224,14 +224,18 @@
                 if not isinstance(fa, int):
                     fa['prefix'] = '_terp_listfields' + ((self.name != '_terp_list' or '') and '/' + self.name)
                     fa['inline'] = True
-                    
+                    if fa.get('type') == 'one2many':
+                        self.edit_inline = False
+                        self.editors = {}
+                        break
                     Widget = get_widget(fa.get('type', 'char')) or get_widget('char')
                     self.editors[f] = Widget(**fa)
 
             # generate hidden fields
-            for f, fa in self.hiddens:
-                fa['prefix'] = '_terp_listfields' + ((self.name != '_terp_list' or '') and '/' + self.name)
-                self.editors[f] = form.Hidden(**fa)
+            if self.edit_inline:
+                for f, fa in self.hiddens:
+                    fa['prefix'] = '_terp_listfields' + ((self.name != '_terp_list' or '') and '/' + self.name)
+                    self.editors[f] = form.Hidden(**fa)
 
         # limit the data
         if self.pageable and len(self.data) > self.limit and self.limit != -1:


Follow ups