Merge lp:~unifield-team/unifield-web/web_oeb_174 into lp:unifield-web

[Xavier ALT]

Hi,

This fix OEB-174, by backport r4892 [1] of upstream web v6.0 branch.

This remove the non-sense default_get() from server-side to move it to client-side - allowing correct evaluation of parents value.

Regards,
Xavier

References:
[1] http://bazaar.launchpad.net/~openerp/openobject-client-web/6.0/revision/4892

=== modified file 'addons/openerp/static/javascript/listgrid.js'
--- addons/openerp/static/javascript/listgrid.js	2012-03-14 17:30:39 +0000
+++ addons/openerp/static/javascript/listgrid.js	2013-04-08 08:56:26 +0000
@@ -849,7 +849,12 @@
                     $editors.each(function () {
                         var $this = jQuery(this);
                         if ($this.val() && $this.attr('callback')) {
-                            MochiKit.Signal.signal(this, 'onchange');
+                            if (($this.attr('kind') == 'many2one' && $this.attr('id').slice($this.attr('id').length - 5) == '_text')
+				|| ($this.attr('kind') == 'many2many' && $this.attr('id').slice($this.attr('id').length - 4) == '_set')) {
+                                // skip many2x 'text' element, onchange will be triggered from real many2x field
+                                return;
+                            }
+                            $this.trigger('change');
                         }
                     });
                 }

=== modified file 'addons/openerp/static/javascript/m2m.js'
--- addons/openerp/static/javascript/m2m.js	2012-03-23 06:58:03 +0000
+++ addons/openerp/static/javascript/m2m.js	2013-04-08 08:56:26 +0000
@@ -72,10 +72,22 @@
 
         // save the reference
         openobject.dom.get(name)._m2m = this;
+
+        var $this = jQuery(idSelector('_m2m_' + name));
+        var $list = jQuery(idSelector(name));
+        $list.attr({
+            'callback': $this.attr('callback'),
+            'change_default': $this.attr('change_default')
+        });
+        $list.bind('before-redisplay.m2m', function () {
+            // calls form.js onChange()
+            onChange(name);
+        });
+
     },
 
     onChange: function() {
-        this.setValue(this.id.value);
+        this.setValue(this.id.value, {'no_onchange': true});
     },
 
     selectAll: function() {
@@ -84,7 +96,8 @@
         }
     },
 
-    setValue: function(ids) {
+    setValue: function(ids, options) {
+        var options = options || {};
         ids = /^\[.*\]/.test(ids) ? ids : '[' + ids + ']';
         ids = eval(ids);
 
@@ -97,7 +110,7 @@
             jQuery(idSelector(this.name)).val(ids);
         }
 
-        if ($id.attr('callback')) {
+        if ($id.attr('callback') && !options.no_onchange) {
             onChange(this.id);
         }
         // Mark form as changed so save alert can appear

=== modified file 'addons/openerp/widgets/listgrid.py'
--- addons/openerp/widgets/listgrid.py	2013-03-13 08:15:04 +0000
+++ addons/openerp/widgets/listgrid.py	2013-04-08 08:56:26 +0000
@@ -369,37 +369,6 @@
                         values[field] = value
                     elif operator == 'in' and len(value) == 1:
                         values[field] = value[0]
-                        
-            #call on_change methods
-            headers_index = dict([(item[0], item[1]) for item in self.headers])
-            to_check = values.keys()
-            for field_name in to_check:
-                if not field_name in headers_index:
-                    continue
-                props = headers_index[field_name]
-                if not "on_change" in props:
-                    continue
-                on_change_method = props["on_change"]
-                
-                match = re.match('^(.*?)\((.*)\)$', on_change_method)
-                if not match:
-                    raise common.error(_('Application Error'), _('Wrong on_change trigger'))
-                func_name = match.group(1)
-                arg_names = [n.strip() for n in match.group(2).split(',')]
-                
-                args = [values[arg] if arg in values else False for arg in arg_names]
-                
-                proxy = rpc.RPCProxy(self.model)
-                response = getattr(proxy, func_name)([], *args)
-                if response is False:
-                    response = {}
-                if 'value' not in response:
-                    response['value'] = {}
-                
-                new_values = response["value"]
-                for k, v in new_values.items():
-                    if k not in values or values[k] != v:
-                        values[k] = v
 
         for f in fields:
             if f in values: