[MERGE] forward port branch saas-16 up to 211961c3747

2 files changed, 15 insertions, 25 deletions

diff --git a/addons/web/static/src/js/fields/abstract_field.js b/addons/web/static/src/js/fields/abstract_field.js
index 426d42d664b..9b484354544 100644
--- a/addons/web/static/src/js/fields/abstract_field.js
+++ b/addons/web/static/src/js/fields/abstract_field.js
@@ -65,12 +65,10 @@ var AbstractField = Widget.extend({
      * @constructor
      * @param {Widget} parent
      * @param {string} name The field name defined in the model
-     * @param {Object} record A record object (result of the get method of 
+     * @param {Object} record A record object (result of the get method of
      *   a basic model)
      * @param {Object} [options]
      * @param {string} [options.mode=readonly] should be 'readonly' or 'edit'
-     * @param {string} [options.standalone=false] this flag indicates that the
-     *   field does not have a controller to delegate to
      */
     init: function (parent, name, record, options) {
         this._super(parent);
@@ -160,10 +158,6 @@ var AbstractField = Widget.extend({
         // calls to the format (resp. parse) function.
         this.formatOptions = {};
         this.parseOptions = {};
-
-        // standalone is a flag indicating that the field does not have a
-        // controller to delegate actions to
-        this.standalone = options.standalone;
     },
     /**
      * When a field widget is appended to the DOM, its start method is called,
diff --git a/addons/web/static/src/js/fields/relational_fields.js b/addons/web/static/src/js/fields/relational_fields.js
index 1935e5804dd..64049d8b1ec 100644
--- a/addons/web/static/src/js/fields/relational_fields.js
+++ b/addons/web/static/src/js/fields/relational_fields.js
@@ -223,25 +223,21 @@ var FieldMany2One = AbstractField.extend({
     _quickCreate: function (name) {
         var self = this;
         var slowCreate = this._searchCreatePopup.bind(this, "form", false, this._createContext(name));
-        var action = function () {
-            return self._rpc({
-                model: self.field.relation,
-                method: 'name_create',
-                args: [name],
-                context: self.record.getContext(self.recordParams),
-            }).then(function (result) {
-                if (self.mode === "edit") {
-                    self.reinitialize({id: result[0], display_name: result[1]});
-                }
-            }, slowCreate);
-        };
-
         if (this.nodeOptions.quick_create) {
-            if (this.standalone) {
-                action();
-            } else {
-                this.trigger_up('mutexify', {action: action});
-            }
+            this.trigger_up('mutexify', {
+                action: function () {
+                    return self._rpc({
+                        model: self.field.relation,
+                        method: 'name_create',
+                        args: [name],
+                        context: self.record.getContext(self.recordParams),
+                    }).then(function (result) {
+                        if (self.mode === "edit") {
+                            self.reinitialize({id: result[0], display_name: result[1]});
+                        }
+                    }, slowCreate);
+                },
+            });
         } else {
             slowCreate();
         }