[MERGE] forward port branch 11.0 up to 3e12f2ff56e

2 files changed, 99 insertions, 37 deletions

diff --git a/addons/web/static/src/js/views/list/list_editable_renderer.js b/addons/web/static/src/js/views/list/list_editable_renderer.js
index a0ce8d31af4..4b8dd3e1d88 100644
--- a/addons/web/static/src/js/views/list/list_editable_renderer.js
+++ b/addons/web/static/src/js/views/list/list_editable_renderer.js
@@ -556,48 +556,48 @@ ListRenderer.include({
     _resequence: function (event, ui) {
         var self = this;
         var movedRecordID = ui.item.data('id');
-        var rows = this.state.data;
-        var row = _.findWhere(rows, {id: movedRecordID});
-        var index0 = rows.indexOf(row);
-        var index1 = ui.item.index();
-        var lower = Math.min(index0, index1);
-        var upper = Math.max(index0, index1) + 1;
-
-        var order = _.findWhere(self.state.orderedBy, {name: self.handleField});
-        var asc = !order || order.asc;
-        var reorderAll = false;
-        var sequence = (asc ? -1 : 1) * Infinity;
-
-        // determine if we need to reorder all lines
-        _.each(rows, function (row, index) {
-            if ((index < lower || index >= upper) &&
-                ((asc && sequence >= row.data[self.handleField]) ||
-                 (!asc && sequence <= row.data[self.handleField]))) {
-                reorderAll = true;
-            }
-            sequence = row.data[self.handleField];
-        });
+        self.unselectRow().then(function () {
+            var rows = self.state.data;
+            var row = _.findWhere(rows, {id: movedRecordID});
+            var index0 = rows.indexOf(row);
+            var index1 = ui.item.index();
+            var lower = Math.min(index0, index1);
+            var upper = Math.max(index0, index1) + 1;
+
+            var order = _.findWhere(self.state.orderedBy, {name: self.handleField});
+            var asc = !order || order.asc;
+            var reorderAll = false;
+            var sequence = (asc ? -1 : 1) * Infinity;
+
+            // determine if we need to reorder all lines
+            _.each(rows, function (row, index) {
+                if ((index < lower || index >= upper) &&
+                    ((asc && sequence >= row.data[self.handleField]) ||
+                     (!asc && sequence <= row.data[self.handleField]))) {
+                    reorderAll = true;
+                }
+                sequence = row.data[self.handleField];
+            });
 
-        if (reorderAll) {
-            rows = _.without(rows, row);
-            rows.splice(index1, 0, row);
-        } else {
-            rows = rows.slice(lower, upper);
-            rows = _.without(rows, row);
-            if (index0 > index1) {
-                rows.unshift(row);
+            if (reorderAll) {
+                rows = _.without(rows, row);
+                rows.splice(index1, 0, row);
             } else {
-                rows.push(row);
+                rows = rows.slice(lower, upper);
+                rows = _.without(rows, row);
+                if (index0 > index1) {
+                    rows.unshift(row);
+                } else {
+                    rows.push(row);
+                }
             }
-        }
 
-        var sequences = _.pluck(_.pluck(rows, 'data'), self.handleField);
-        var rowIDs = _.pluck(rows, 'id');
+            var sequences = _.pluck(_.pluck(rows, 'data'), self.handleField);
+            var rowIDs = _.pluck(rows, 'id');
 
-        if (!asc) {
-            rowIDs.reverse();
-        }
-        this.unselectRow().then(function () {
+            if (!asc) {
+                rowIDs.reverse();
+            }
             self.trigger_up('resequence', {
                 rowIDs: rowIDs,
                 offset: _.min(sequences),
diff --git a/addons/web/static/tests/views/form_tests.js b/addons/web/static/tests/views/form_tests.js
index f0f0da04e94..df94fbe1066 100644
--- a/addons/web/static/tests/views/form_tests.js
+++ b/addons/web/static/tests/views/form_tests.js
@@ -7525,6 +7525,68 @@ QUnit.module('Views', {
                      .trigger($.Event('keydown', {which: $.ui.keyCode.ESCAPE}));
         form.destroy();
     });
+
+    QUnit.test('resequence list lines when discardable lines are present', function (assert) {
+        assert.expect(8);
+
+        var onchangeNum = 0;
+
+        this.data.partner.onchanges = {
+            p: function (obj) {
+                onchangeNum++;
+                obj.foo = obj.p.length.toString();
+            },
+        };
+
+        var form = createView({
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch: '<form>' +
+                    '<field name="foo"/>' +
+                    '<field name="p"/>' +
+                '</form>',
+            archs: {
+                'partner,false,list':
+                    '<tree editable="bottom">' +
+                        '<field name="int_field" widget="handle"/>' +
+                        '<field name="display_name" required="1"/>' +
+                    '</tree>',
+            },
+        });
+
+        assert.strictEqual(onchangeNum, 1, "one onchange happens when form is opened");
+        assert.strictEqual(form.$('[name="foo"]').val(), "0", "onchange worked there is 0 line");
+
+        // Add one line
+        form.$('.o_field_x2many_list_row_add a').click();
+        form.$('.o_field_one2many input:first').focus();
+        form.$('.o_field_one2many input:first').val('first line').trigger('input');
+        form.$('input[name="foo"]').click();
+        assert.strictEqual(onchangeNum, 2, "one onchange happens when a line is added");
+        assert.strictEqual(form.$('[name="foo"]').val(), "1", "onchange worked there is 1 line");
+
+        // Drag and drop second line before first one (with 1 draft and invalid line)
+        form.$('.o_field_x2many_list_row_add a').click();
+        testUtils.dragAndDrop(
+            form.$('.ui-sortable-handle').eq(0),
+            form.$('.o_data_row').last(),
+            {position: 'bottom'}
+        );
+        assert.strictEqual(onchangeNum, 3, "one onchange happens when lines are resequenced")
+        assert.strictEqual(form.$('[name="foo"]').val(), "1", "onchange worked there is 1 line");
+
+        // Add a second line
+        form.$('.o_field_x2many_list_row_add a').click();
+        form.$('.o_field_one2many input:first').focus();
+        form.$('.o_field_one2many input:first').val('second line').trigger('input');
+        form.$('input[name="foo"]').click();
+        assert.strictEqual(onchangeNum, 4, "one onchange happens when a line is added");
+        assert.strictEqual(form.$('[name="foo"]').val(), "2", "onchange worked there is 2 lines");
+
+        form.destroy();
+    });
+
     QUnit.test('if the focus is on the discard button, hitting ESCAPE should discard', function (assert) {
         assert.expect(1);