From 2c966909e2c0b5e45912a6ff85577f0b19a5f4c9 Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Thu, 5 Jul 2018 13:17:59 +0200 Subject: [FIX] *: fix some side-effects of https://github.com/odoo/odoo/commit/9de1bc0eef6f5bfaa2a8d745431caa361ae91548 - JS Modals were not correctly built anymore, their .modal-body element was duplicated and many without-effect JS lines were introduced (as a side effect, the form view design was broken when inside modals) - Tests were changed to make bugs go unnoticed. For example, the media dialog functionnality was entirely broken because the .modal-dialog element was not receiving the correct class anymore. - The JS translation function is _t, not _ - Do not use the tag as a regular DOM element, it is meant to be unique, in the <head/> section - CSS rules were added to the utils.scss file, which is meant to contain functions and mixins, otherwise, the rule is duplicated in every asset - Some icons were still broken, as missed by https://github.com/odoo/odoo/commit/f90cf060a3cfeb37a67bec83264c0aaab8892b56 - Tests were changed to use [role="dialog"]/footer/header in their selectors without any reason, this commit restores some of that to avoid rebase conflicts with the BS4 work. - ... Note: other elements should still be discussed, like the direct use of the 'o_form_label' class in views definition... but those do not cause direct problems. --- .../web/static/tests/widgets/data_export_tests.js | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'addons/web/static/tests/widgets/data_export_tests.js') diff --git a/addons/web/static/tests/widgets/data_export_tests.js b/addons/web/static/tests/widgets/data_export_tests.js index 4948db07474..4569a5a6290 100644 --- a/addons/web/static/tests/widgets/data_export_tests.js +++ b/addons/web/static/tests/widgets/data_export_tests.js @@ -107,15 +107,15 @@ QUnit.module('widgets', { list.$('thead th.o_list_record_selector input').click(); list.sidebar.$('a:contains(Export)').click(); - assert.strictEqual($('[role="dialog"]').length, 1, "a modal dialog should be open"); + assert.strictEqual($('.modal').length, 1, "a modal dialog should be open"); assert.strictEqual($('span.o_tree_column:contains(Activities)').length, 1, "the Activities field should be in the list of exportable fields"); // select the field Description, click on add, then export and close - $('[role="dialog"] span:contains(Description)').click(); - $('[role="dialog"] .o_add_field').click(); - $('[role="dialog"] span:contains(Export To File)').click(); - $('[role="dialog"] span:contains(Close)').click(); + $('.modal span:contains(Description)').click(); + $('.modal .o_add_field').click(); + $('.modal span:contains(Export To File)').click(); + $('.modal span:contains(Close)').click(); list.destroy(); framework.blockUI = blockUI; @@ -185,26 +185,26 @@ QUnit.module('widgets', { // Open the export modal list.$('thead th.o_list_record_selector input').click(); list.sidebar.$('a:contains(Export)').click(); - assert.strictEqual($('[role="dialog"]').length, 1, + assert.strictEqual($('.modal').length, 1, "a modal dialog should be open"); // Select 'Activities' in fields to export - assert.strictEqual($('[role="dialog"] select.o_fields_list option').length, 0, + assert.strictEqual($('.modal select.o_fields_list option').length, 0, "the fields list should be empty"); - $('[role="dialog"] .o_export_tree_item:contains(Activities)').click(); - $('[role="dialog"] button:contains(Add)').click(); - assert.strictEqual($('[role="dialog"] select.o_fields_list option').length, 1, + $('.modal .o_export_tree_item:contains(Activities)').click(); + $('.modal button:contains(Add)').click(); + assert.strictEqual($('.modal select.o_fields_list option').length, 1, "there should be one item in the fields list"); // Save fields list - $('[role="dialog"] a:contains(Save fields list)').click(); - $('[role="dialog"] .o_save_list > input').val('fields list').trigger('input'); - $('[role="dialog"] .o_save_list > button').click(); + $('.modal a:contains(Save fields list)').click(); + $('.modal .o_save_list > input').val('fields list').trigger('input'); + $('.modal .o_save_list > button').click(); assert.verifySteps(['build_search_data', 'create'], "create should have been called"); // Close the modal and destroy list - $('[role="dialog"] button span:contains(Close)').click(); + $('.modal button span:contains(Close)').click(); list.destroy(); // restore create function -- cgit v1.2.3