From 34b3770ad1ee9c872acaf4f82ac3c6cf52d5d333 Mon Sep 17 00:00:00 2001
From: "Louis (loco)" <loco@odoo.com>
Date: Fri, 26 May 2023 15:09:48 +0000
Subject: [PATCH] [FIX] website: enable to use addCustomField function with
more types
The goal of this commit is to be able to use the `addCustomField`
function with a `type` argument that is different of `checkbox`,
`radio` or `select`.
opw-3246341
Part-of: odoo/odoo#117632
---
.../website/static/tests/tours/website_form_editor.js | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/addons/website/static/tests/tours/website_form_editor.js b/addons/website/static/tests/tours/website_form_editor.js
index 4d0e42486f80..d0a927d3e2e4 100644
--- a/addons/website/static/tests/tours/website_form_editor.js
+++ b/addons/website/static/tests/tours/website_form_editor.js
@@ -48,7 +48,9 @@ odoo.define('website.tour.form_editor', function (require) {
trigger: `we-select we-button[${data}]`,
}];
};
- const addField = function (data, name, type, label, required, display = {visibility: VISIBLE, condition: ''}) {
+ const addField = function (name, type, label, required, isCustom,
+ display = {visibility: VISIBLE, condition: ""}) {
+ const data = isCustom ? `data-custom-field="${name}"` : `data-existing-field="${name}"`;
const ret = [{
content: "Select form",
extra_trigger: '.s_website_form_field',
@@ -90,7 +92,8 @@ odoo.define('website.tour.form_editor', function (require) {
}
if (type !== 'checkbox' && type !== 'radio' && type !== 'select') {
let inputType = type === 'textarea' ? type : `input[type="${type}"]`;
- testText += `:has(${inputType}[name="${name}"]${required ? '[required]' : ''})`;
+ const nameAttribute = isCustom && label ? label : name;
+ testText += `:has(${inputType}[name="${nameAttribute}"]${required ? "[required]" : ""})`;
}
ret.push({
content: "Check the resulting field",
@@ -100,10 +103,10 @@ odoo.define('website.tour.form_editor', function (require) {
return ret;
};
const addCustomField = function (name, type, label, required, display) {
- return addField(`data-custom-field="${name}"`, name, type, label, required, display);
+ return addField(name, type, label, required, true, display);
};
const addExistingField = function (name, type, label, required, display) {
- return addField(`data-existing-field="${name}"`, name, type, label, required, display);
+ return addField(name, type, label, required, false, display);
};
tour.register("website_form_editor_tour", {
--
GitLab