From 1440cb03c75df984f9f3262247afb11a9cf98eb8 Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Wed, 29 Jan 2025 22:40:34 +0100 Subject: [PATCH] [MIG] base_import_security_group: Migration to 18.0 --- base_import_security_group/__manifest__.py | 2 +- .../static/src/js/import.esm.js | 2 -- .../static/src/js/tour_import.esm.js | 15 ++++++--------- .../tests/test_base_import_security_group.py | 4 ++-- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/base_import_security_group/__manifest__.py b/base_import_security_group/__manifest__.py index 054a270128..b61025f9dc 100644 --- a/base_import_security_group/__manifest__.py +++ b/base_import_security_group/__manifest__.py @@ -5,7 +5,7 @@ { "name": "Optional CSV import", - "version": "17.0.1.0.0", + "version": "18.0.1.0.0", "category": "Server tools", "summary": "Group-based permissions for importing CSV files", "license": "AGPL-3", diff --git a/base_import_security_group/static/src/js/import.esm.js b/base_import_security_group/static/src/js/import.esm.js index dbdc58b30f..a7e0dfb5bf 100644 --- a/base_import_security_group/static/src/js/import.esm.js +++ b/base_import_security_group/static/src/js/import.esm.js @@ -1,5 +1,3 @@ -/** @odoo-module **/ - /* * Copyright 2023 ACSONE SA/NV * Copyright 2021 Stefan Rijnhart diff --git a/base_import_security_group/static/src/js/tour_import.esm.js b/base_import_security_group/static/src/js/tour_import.esm.js index ad8665744a..c56d01adec 100644 --- a/base_import_security_group/static/src/js/tour_import.esm.js +++ b/base_import_security_group/static/src/js/tour_import.esm.js @@ -1,4 +1,3 @@ -/** @odoo-module **/ import {registry} from "@web/core/registry"; import {stepUtils} from "@web_tour/tour_service/tour_utils"; registry.category("web_tour.tours").add("button_import_ok", { @@ -11,21 +10,20 @@ registry.category("web_tour.tours").add("button_import_ok", { run: "click", }, { - trigger: ".dropdown-toggle[data-menu-xmlid='base.menu_users']", + trigger: ".o-dropdown[data-menu-xmlid='base.menu_users']", run: "click", }, { trigger: - ".dropdown-item[data-menu-xmlid='base.menu_action_res_company_form']", + ".o-dropdown-item[data-menu-xmlid='base.menu_action_res_company_form']", run: "click", }, { - trigger: ".o_cp_action_menus .dropdown-toggle", + trigger: ".o_cp_action_menus .o-dropdown", run: "click", }, { trigger: "span.o_import_menu", - isCheck: true, }, ], }); @@ -39,21 +37,20 @@ registry.category("web_tour.tours").add("button_import_ko", { run: "click", }, { - trigger: ".dropdown-toggle[data-menu-xmlid='base.menu_users']", + trigger: ".o-dropdown[data-menu-xmlid='base.menu_users']", run: "click", }, { trigger: - ".dropdown-item[data-menu-xmlid='base.menu_action_res_company_form']", + ".o-dropdown-item[data-menu-xmlid='base.menu_action_res_company_form']", run: "click", }, { - trigger: ".o_cp_action_menus .dropdown-toggle", + trigger: ".o_cp_action_menus .o-dropdown", run: "click", }, { trigger: ".dropdown-menu:not(:has(span.o_import_menu))", - isCheck: true, }, ], }); diff --git a/base_import_security_group/tests/test_base_import_security_group.py b/base_import_security_group/tests/test_base_import_security_group.py index 82fa7d8bfb..80ac2503aa 100644 --- a/base_import_security_group/tests/test_base_import_security_group.py +++ b/base_import_security_group/tests/test_base_import_security_group.py @@ -61,6 +61,6 @@ def test_access_demo(self): self.assertEqual(len(res2["messages"]), 1) self.assertEqual( res2["messages"][0]["message"], - "User (ID: %s) is not allowed to import data in " - "model ir.model.access." % self.user_test.id, + f"User (ID: {self.user_test.id}) is not allowed to import data in " + "model ir.model.access.", )