[FIX] web: fix rendering issue with fieldselection on m2o

Before this commit, the FieldSelection did not work properly in edit
mode with a many2one.  This was because it did not take the correct
value into account, and the test did not notice it, so both had to be
fixed.

1 files changed, 13 insertions, 34 deletions

diff --git a/addons/web/static/src/js/fields/relational_fields.js b/addons/web/static/src/js/fields/relational_fields.js
index 4ae30264ff0..1946cfeb529 100644
--- a/addons/web/static/src/js/fields/relational_fields.js
+++ b/addons/web/static/src/js/fields/relational_fields.js
@@ -1337,7 +1337,6 @@ var FieldSelection = AbstractField.extend({
      */
     init: function () {
         this._super.apply(this, arguments);
-        this.values = [];
         if (this.field.type === 'many2one') {
             this.values = this.record.specialData[this.name];
         } else {
@@ -1353,34 +1352,23 @@ var FieldSelection = AbstractField.extend({
     //--------------------------------------------------------------------------
 
     /**
-     * Format the value to a valid string
-     *
-     * @override
-     * @private
-     * @param {any} value
-     * @returns {string}
-     */
-    _formatValue: function (value) {
-        if (this.field.type === 'many2one') {
-            var options = _.extend({}, this.nodeOptions);
-            return field_utils.format.many2one(value, this.field, this.recordData, options);
-        } else {
-            return this._super(value);
-        }
-    },
-    /**
      * @override
      * @private
      */
     _renderEdit: function () {
-        this.$el.empty();
-        for (var i = 0 ; i < this.values.length ; i++) {
-            this.$el.append($('<option/>', {
-                value: JSON.stringify(this.values[i][0]),
-                html: this.values[i][1]
-            }));
+        if (!this.$el.children().length) {
+            for (var i = 0 ; i < this.values.length ; i++) {
+                this.$el.append($('<option/>', {
+                    value: JSON.stringify(this.values[i][0]),
+                    html: this.values[i][1]
+                }));
+            }
         }
-        this.$el.val(JSON.stringify(this._parseValue(this.value)));
+        var value = this.value;
+        if (this.field.type === 'many2one' && value) {
+            value = value.data.id;
+        }
+        this.$el.val(JSON.stringify(value));
     },
     /**
      * @override
@@ -1389,16 +1377,6 @@ var FieldSelection = AbstractField.extend({
     _renderReadonly: function () {
         this.$el.empty().html(this._formatValue(this.value));
     },
-    /**
-     * @override
-     * @private
-     */
-    _reset: function () {
-        this._super.apply(this, arguments);
-        if (this.field.type === 'many2one') {
-            this.value = this.value.data.id;
-        }
-    },
 
     //--------------------------------------------------------------------------
     // Handlers
@@ -1407,6 +1385,7 @@ var FieldSelection = AbstractField.extend({
     /**
      * The small slight difficulty is that we have to set the value differently
      * depending on the field type.
+     *
      * @private
      */
     _onChange: function () {