Merge lp:~openerp-dev/openerp-web/trunk-apiculture into lp:openerp-web

[Antony Lesuisse (OpenERP)]

Unmerged revisions

3961. By Raphael Collet (OpenERP) on 2014-05-12

[MERGE] from trunk

3960. By Raphael Collet (OpenERP) on 2014-05-05

[MERGE] from trunk

3959. By Raphael Collet (OpenERP) on 2014-04-29

[MERGE] from trunk

3958. By Raphael Collet (OpenERP) on 2014-04-17

[MERGE] from trunk

3957. By Raphael Collet (OpenERP) on 2014-04-16

[IMP] web/view_form: accept on_change="0" and do nothing in that case

3956. By Raphael Collet (OpenERP) on 2014-04-14

[MERGE] from trunk

3955. By Raphael Collet (OpenERP) on 2014-04-07

[MERGE] from trunk

3954. By Raphael Collet (OpenERP) on 2014-03-31

[MERGE] from trunk

3953. By Raphael Collet (OpenERP) on 2014-03-10

[FIX] web: web sending on_change values, do not leak virtual ids

3952. By Raphael Collet (OpenERP) on 2014-03-05

[IMP] web/form_view/on_change: add parent field in onchange values

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2014-05-08 15:34:18 +0000
+++ addons/web/static/src/js/view_form.js	2014-05-21 16:09:53 +0000
@@ -438,12 +438,50 @@
             $(".oe_form_pager_state", this.$pager).html(_.str.sprintf(_t("%d / %d"), this.dataset.index + 1, this.dataset.ids.length));
         }
     },
+    parse_on_change_v8: function (onchange, widget) {
+        // onchange V8: call onchange(field_values, field_name, tocheck)
+        var field_values = this.get_fields_values();
+        if (field_values.id.toString().match(instance.web.BufferedDataSet.virtual_id_regex)) {
+            delete field_values.id;
+        }
+        if (this.dataset.parent_view) {
+            // this belongs to a parent view: add parent field if possible
+            var parent_view = this.dataset.parent_view;
+            var child_name = this.dataset.child_name;
+            var parent_name = parent_view.get_field_desc(child_name).relation_field;
+            if (parent_name) {
+                // consider all fields except the inverse of the parent field
+                var parent_values = parent_view.get_fields_values();
+                delete parent_values[child_name];
+                field_values[parent_name] = parent_values;
+            }
+        }
+        // add all known subfields in views into tocheck
+        var tocheck = [];
+        _.each(this.fields, function(field, name) {
+            _.each(field.field.views, function(view) {
+                _.each(view.fields, function(subfield, subname) {
+                    tocheck.push(name + "." + subname);
+                });
+            });
+        });
+        return {
+            method: "onchange",
+            args: [field_values, widget.name, tocheck]
+        };
+    },
     parse_on_change: function (on_change, widget) {
         var self = this;
         var onchange = _.str.trim(on_change);
-        var call = onchange.match(/^\s?(.*?)\((.*?)\)\s?$/);
+        var call = onchange.match(/^(\w+)\((.*?)\)$/);
         if (!call) {
-            throw new Error(_.str.sprintf( _t("Wrong on change format: %s"), onchange ));
+            if (onchange === "1" || onchange === "true") {
+                return this.parse_on_change_v8(onchange, widget);
+            }
+            if (onchange === "0" || onchange === "false") {
+                return {};
+            }
+            throw new Error(_.str.sprintf(_t("Wrong on change format: %s"), onchange));
         }
 
         var method = call[1];
@@ -515,21 +553,21 @@
         var widget = on_change_obj.widget;
         var processed = on_change_obj.processed;
         try {
-            var def;
+            var def = $.when({});
             processed = processed || [];
             processed.push(widget.name);
             var on_change = widget.node.attrs.on_change;
             if (on_change) {
                 var change_spec = self.parse_on_change(on_change, widget);
-                var ids = [];
-                if (self.datarecord.id && !instance.web.BufferedDataSet.virtual_id_regex.test(self.datarecord.id)) {
-                    // In case of a o2m virtual id, we should pass an empty ids list
-                    ids.push(self.datarecord.id);
+                if (change_spec.method) {
+                    var ids = [];
+                    if (self.datarecord.id && !instance.web.BufferedDataSet.virtual_id_regex.test(self.datarecord.id)) {
+                        // In case of a o2m virtual id, we should pass an empty ids list
+                        ids.push(self.datarecord.id);
+                    }
+                    def = self.alive(new instance.web.Model(self.dataset.model).call(
+                        change_spec.method, [ids].concat(change_spec.args)));
                 }
-                def = self.alive(new instance.web.Model(self.dataset.model).call(
-                    change_spec.method, [ids].concat(change_spec.args)));
-            } else {
-                def = $.when({});
             }
             return def.then(function(response) {
                 if (widget.field['change_default']) {