diff --git a/addons/mail/static/src/js/activity.js b/addons/mail/static/src/js/activity.js index d46a929e4ac..ff9305f0022 100644 --- a/addons/mail/static/src/js/activity.js +++ b/addons/mail/static/src/js/activity.js @@ -342,7 +342,7 @@ var BasicActivity = AbstractField.extend({ var previousActivityTypeID = $markDoneBtn.data('previous-activity-type-id') || false; var chainingTypeActivity = $markDoneBtn.data('chaining-type-activity'); - if ($markDoneBtn.data('toggle') === 'collapse') { + if ($markDoneBtn[0].dataset.bsToggle === 'collapse') { var $actLi = $markDoneBtn.parents('.o_log_activity'); var $panel = self.$('#o_activity_form_' + activityID); @@ -462,7 +462,7 @@ var BasicActivity = AbstractField.extend({ ev.stopPropagation(); if ($btn.data('bs.popover')) { $btn.popover('hide'); - } else if ($btn.data('toggle') === 'collapse') { + } else if ($btn[0].dataset.bsToggle === 'collapse') { self.$('#o_activity_form_' + activityID).collapse('hide'); } }); diff --git a/addons/website_event/views/event_templates_page_registration.xml b/addons/website_event/views/event_templates_page_registration.xml index 6126ff7d07b..0931f5bbf35 100644 --- a/addons/website_event/views/event_templates_page_registration.xml +++ b/addons/website_event/views/event_templates_page_registration.xml @@ -436,7 +436,7 @@ btn btn-primary o_wevent_registration_btn collapsed ms-auto - collapse + collapse diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml index f8e5c110650..25199faaf22 100644 --- a/addons/website_forum/views/website_forum.xml +++ b/addons/website_forum/views/website_forum.xml @@ -1161,7 +1161,7 @@
- Comment @@ -1343,7 +1343,7 @@
Comment diff --git a/odoo/addons/base/models/ir_ui_view.py b/odoo/addons/base/models/ir_ui_view.py index f300f3b21ae..d7d7864dad8 100644 --- a/odoo/addons/base/models/ir_ui_view.py +++ b/odoo/addons/base/models/ir_ui_view.py @@ -1690,13 +1690,13 @@ actual arch. if vnames: name_manager.must_have_fields(vnames, f"{attr}={expr}") - elif attr == 'data-toggle' and expr == 'tab': + elif attr == 'data-bs-toggle' and expr == 'tab': if node.get('role') != 'tab': - msg = 'tab link (data-toggle="tab") must have "tab" role' + msg = 'tab link (data-bs-toggle="tab") must have "tab" role' self._log_view_warning(msg, node) aria_control = node.get('aria-controls') or node.get('t-att-aria-controls') if not aria_control and not node.get('t-attf-aria-controls'): - msg = 'tab link (data-toggle="tab") must have "aria_control" defined' + msg = 'tab link (data-bs-toggle="tab") must have "aria_control" defined' self._log_view_warning(msg, node) if aria_control and '#' in aria_control: msg = 'aria-controls in tablink cannot contains "#"' diff --git a/odoo/addons/base/tests/test_views.py b/odoo/addons/base/tests/test_views.py index 9118e3ce48e..8fa75f9fa8e 100644 --- a/odoo/addons/base/tests/test_views.py +++ b/odoo/addons/base/tests/test_views.py @@ -2543,10 +2543,10 @@ class TestViews(ViewCase): self.assertWarning('