From 0ac405550452cb304408b56313776fd3f9538dc7 Mon Sep 17 00:00:00 2001 From: Mohammed Shekha Date: Tue, 9 Jul 2019 08:53:42 +0000 Subject: [IMP] web: do not set focus on form when lastActivatedFieldIndex is not set When opening a dialog using mouse and closing it, form_dialog_discarded is triggered, which tries to set focus on form while lastActivatedFieldIndex is -1, as dialog is opened using mouse directly do not set focus back to form widget if lastActivatedFieldIndex is -1 task-2031706 closes odoo/odoo#34684 Signed-off-by: VincentSchippefilt --- addons/web/static/tests/fields/relational_fields_tests.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'addons/web/static/tests/fields/relational_fields_tests.js') diff --git a/addons/web/static/tests/fields/relational_fields_tests.js b/addons/web/static/tests/fields/relational_fields_tests.js index 52fc313e452..459c51df441 100644 --- a/addons/web/static/tests/fields/relational_fields_tests.js +++ b/addons/web/static/tests/fields/relational_fields_tests.js @@ -2980,8 +2980,8 @@ QUnit.module('relational_fields', { // Open many2one modal form.$buttons.find('.btn.o_form_button_edit').click(); form.$('.o_external_button').click(); - var $originalModal = $('.modal-dialog'); - var $focusedModal = $(document.activeElement).closest('.modal-dialog'); + var $originalModal = $('.modal'); + var $focusedModal = $(document.activeElement).closest('.modal'); assert.equal($originalModal.length, 1, 'There should be one modal'); assert.equal($originalModal[0], $focusedModal[0], 'Modal is focused'); @@ -2989,8 +2989,8 @@ QUnit.module('relational_fields', { // Open many2one modal of field in many2one modal $originalModal.find('.o_external_button').click(); - var $modals = $('.modal-dialog'); - $focusedModal = $(document.activeElement).closest('.modal-dialog'); + var $modals = $('.modal'); + $focusedModal = $(document.activeElement).closest('.modal'); assert.equal($modals.length, 2, 'There should be two modals'); assert.equal($modals[1], $focusedModal[0], 'Last modal is focused'); @@ -2998,8 +2998,8 @@ QUnit.module('relational_fields', { // Close second modal $modals.last().find('button[class="close"]').click(); - var $modal = $('.modal-dialog'); - $focusedModal = $(document.activeElement).closest('.modal-dialog'); + var $modal = $('.modal'); + $focusedModal = $(document.activeElement).closest('.modal'); assert.equal($modal.length, 1, 'There should be one modal'); assert.equal($modal[0], $originalModal[0], 'First modal is still opened'); -- cgit v1.2.3