From 6e6b6ab5f7d343de9bc969f3bcb668ffbd750572 Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Wed, 15 Mar 2017 10:15:39 +0100
Subject: [PATCH] [FIX] web: FieldMany2one: focus() is public

The focus() method of the FieldMany2One was private (named
_focus()), but it is called by from outside by the
FieldMany2ManyTags (which called focus(), so it produced a
traceback).
---
 .../static/src/js/fields/relational_fields.js | 18 ++++----
 .../test/fields/relational_fields_tests.js    | 43 +++++++++++++++++++
 2 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/addons/web/static/src/js/fields/relational_fields.js b/addons/web/static/src/js/fields/relational_fields.js
index aec966f438c..1857241d85b 100644
--- a/addons/web/static/src/js/fields/relational_fields.js
+++ b/addons/web/static/src/js/fields/relational_fields.js
@@ -117,6 +117,14 @@ var FieldMany2One = AbstractField.extend({
         this.$input.focus();
         setTimeout(this.$input.select.bind(this.$input), 0);
     },
+    /**
+     * Focuses the input.
+     */
+    focus: function () {
+        if (this.mode === "edit") {
+            this.$input.focus();
+        }
+    },
     reinitialize: function (value) {
         this.floating = false;
         this._setValue(value);
@@ -174,14 +182,6 @@ var FieldMany2One = AbstractField.extend({
         }
         return tmp;
     },
-    /**
-     * @private
-     */
-    _focus: function () {
-        if (this.mode === "edit") {
-            this.$input.focus();
-        }
-    },
     /**
      * @private
      * @returns {Array}
@@ -358,7 +358,7 @@ var FieldMany2One = AbstractField.extend({
             disable_multiple_selection: true,
             on_selected: function (element_ids) {
                 self.reinitialize({id: element_ids[0]});
-                self._focus();
+                self.focus();
             }
         })).open();
     },
diff --git a/addons/web/static/test/fields/relational_fields_tests.js b/addons/web/static/test/fields/relational_fields_tests.js
index 559fd03751b..aa08aa65bb4 100644
--- a/addons/web/static/test/fields/relational_fields_tests.js
+++ b/addons/web/static/test/fields/relational_fields_tests.js
@@ -2776,6 +2776,49 @@ QUnit.module('relational_fields', {
         form.destroy();
     });
 
+    QUnit.test('fieldmany2many tags in editable list', function (assert) {
+        assert.expect(5);
+
+        this.data.partner.records[0].timmy = [12];
+
+        var list = createView({
+            View: ListView,
+            model: 'partner',
+            data: this.data,
+            arch:'<tree editable="bottom">' +
+                    '<field name="foo"/>' +
+                    '<field name="timmy" widget="many2many_tags"/>' +
+                '</tree>',
+        });
+
+        assert.strictEqual(list.$('.o_data_row:first .o_form_field_many2manytags .badge').length, 1,
+            "m2m field should contain one tag");
+
+        // edit first row
+        list.$('.o_data_row:first td:nth(2)').click();
+
+        var $m2o = list.$('.o_data_row:first .o_form_field_many2manytags .o_form_field_many2one');
+        assert.strictEqual($m2o.length, 1, "a many2one widget should have been instantiated");
+
+        // add a tag
+        var $input = $m2o.find('input');
+        $input.click();
+        $input.autocomplete('widget').find('li:first()').click(); // adds a tag
+
+        assert.strictEqual(list.$('.o_data_row:first .o_form_field_many2manytags .badge').length, 2,
+            "m2m field should contain 2 tags");
+        assert.ok(list.$('.o_data_row:first .o_many2many_tags_cell').hasClass('o_field_dirty'),
+            "edited cell should have class o_field_dirty");
+
+        // leave edition
+        list.$('.o_data_row:nth(1) td:nth(2)').click();
+
+        assert.strictEqual(list.$('.o_data_row:first .o_form_field_many2manytags .badge').length, 2,
+            "m2m field should contain 2 tags");
+
+        list.destroy();
+    });
+
     QUnit.module('FieldRadio');
 
     QUnit.test('fieldradio widget on a many2one in a new record', function (assert) {