pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REF] web_editor, website: remove some start15 compatibility code

Browse Source 
With the forward-port at [1], it was forgotten to adapt the PR to
simplify the code that was added to support current start15 databases.

[1]: https://github.com/odoo/odoo/pull/77255

closes odoo/odoo#77630

Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
This commit is contained in:
qsm-odoo
2021-10-01 20:42:07 +00:00
parent e09667b60f
commit a54f11edb1
2 changed files with 56 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_editor/static/src/scss/wysiwyg_snippets.scss
+3 -6
View File
@@ -862,12 +862,9 @@ body.editor_enable.editor_has_snippets {
}
}
// TODO: Keep only the first class in master
.o_we_large, .o_we_large_input {
> div {
flex: 1 1 auto !important;
width: 100%;
}
.o_we_large > div {
flex: 1 1 auto !important;
width: 100%;
}
// Buttons
addons/website/static/src/snippets/s_website_form/options.js
+53 -59
View File
@@ -1212,65 +1212,63 @@ options.registry.WebsiteFieldEditor = FieldEditor.extend({
_renderCustomXML: async function (uiFragment) {
// Update available visibility dependencies
const selectDependencyEl = uiFragment.querySelector('we-select[data-name="hidden_condition_opt"]');
if (selectDependencyEl) {
const existingDependencyNames = [];
for (const el of this.formEl.querySelectorAll('.s_website_form_field:not(.s_website_form_dnone)')) {
const inputEl = el.querySelector('.s_website_form_input');
if (el.querySelector('.s_website_form_label_content') && inputEl && inputEl.name
&& inputEl.name !== this.$target[0].querySelector('.s_website_form_input').name
&& !existingDependencyNames.includes(inputEl.name)) {
const button = document.createElement('we-button');
button.textContent = el.querySelector('.s_website_form_label_content').textContent;
button.dataset.setVisibilityDependency = inputEl.name;
selectDependencyEl.append(button);
existingDependencyNames.push(inputEl.name);
}
const existingDependencyNames = [];
for (const el of this.formEl.querySelectorAll('.s_website_form_field:not(.s_website_form_dnone)')) {
const inputEl = el.querySelector('.s_website_form_input');
if (el.querySelector('.s_website_form_label_content') && inputEl && inputEl.name
&& inputEl.name !== this.$target[0].querySelector('.s_website_form_input').name
&& !existingDependencyNames.includes(inputEl.name)) {
const button = document.createElement('we-button');
button.textContent = el.querySelector('.s_website_form_label_content').textContent;
button.dataset.setVisibilityDependency = inputEl.name;
selectDependencyEl.append(button);
existingDependencyNames.push(inputEl.name);
}
}
const comparator = this.$target[0].dataset.visibilityComparator;
const dependencyEl = this._getDependencyEl();
if (dependencyEl) {
if ((['radio', 'checkbox'].includes(dependencyEl.type) || dependencyEl.nodeName === 'SELECT')) {
// Update available visibility options
const selectOptEl = uiFragment.querySelectorAll('we-select[data-name="hidden_condition_no_text_opt"]')[1];
const inputContainerEl = this.$target[0];
const dependencyEl = this._getDependencyEl();
if (dependencyEl.nodeName === 'SELECT') {
for (const option of dependencyEl.querySelectorAll('option')) {
const button = document.createElement('we-button');
button.textContent = option.value;
button.dataset.selectDataAttribute = option.value;
selectOptEl.append(button);
}
if (!inputContainerEl.dataset.visibilityCondition) {
inputContainerEl.dataset.visibilityCondition = dependencyEl.querySelector('option').value;
}
} else { // DependecyEl is a radio or a checkbox
const dependencyContainerEl = dependencyEl.closest('.s_website_form_field');
const inputsInDependencyContainer = dependencyContainerEl.querySelectorAll('.s_website_form_input');
for (const el of inputsInDependencyContainer) {
const button = document.createElement('we-button');
button.textContent = el.value;
button.dataset.selectDataAttribute = el.value;
selectOptEl.append(button);
}
if (!inputContainerEl.dataset.visibilityCondition) {
inputContainerEl.dataset.visibilityCondition = inputsInDependencyContainer[0].value;
}
const comparator = this.$target[0].dataset.visibilityComparator;
const dependencyEl = this._getDependencyEl();
if (dependencyEl) {
if ((['radio', 'checkbox'].includes(dependencyEl.type) || dependencyEl.nodeName === 'SELECT')) {
// Update available visibility options
const selectOptEl = uiFragment.querySelectorAll('we-select[data-name="hidden_condition_no_text_opt"]')[1];
const inputContainerEl = this.$target[0];
const dependencyEl = this._getDependencyEl();
if (dependencyEl.nodeName === 'SELECT') {
for (const option of dependencyEl.querySelectorAll('option')) {
const button = document.createElement('we-button');
button.textContent = option.value;
button.dataset.selectDataAttribute = option.value;
selectOptEl.append(button);
}
if (!inputContainerEl.dataset.visibilityComparator) {
inputContainerEl.dataset.visibilityComparator = 'selected';
if (!inputContainerEl.dataset.visibilityCondition) {
inputContainerEl.dataset.visibilityCondition = dependencyEl.querySelector('option').value;
}
} else { // DependecyEl is a radio or a checkbox
const dependencyContainerEl = dependencyEl.closest('.s_website_form_field');
const inputsInDependencyContainer = dependencyContainerEl.querySelectorAll('.s_website_form_input');
for (const el of inputsInDependencyContainer) {
const button = document.createElement('we-button');
button.textContent = el.value;
button.dataset.selectDataAttribute = el.value;
selectOptEl.append(button);
}
if (!inputContainerEl.dataset.visibilityCondition) {
inputContainerEl.dataset.visibilityCondition = inputsInDependencyContainer[0].value;
}
this.rerender = comparator ? this.rerender : true;
}
if (!comparator) {
// Set a default comparator according to the type of dependency
if (dependencyEl.dataset.target) {
this.$target[0].dataset.visibilityComparator = 'after';
} else if (['text', 'email', 'tel', 'url', 'search', 'password', 'number'].includes(dependencyEl.type)
|| dependencyEl.nodeName === 'TEXTAREA') {
this.$target[0].dataset.visibilityComparator = 'equal';
}
if (!inputContainerEl.dataset.visibilityComparator) {
inputContainerEl.dataset.visibilityComparator = 'selected';
}
this.rerender = comparator ? this.rerender : true;
}
if (!comparator) {
// Set a default comparator according to the type of dependency
if (dependencyEl.dataset.target) {
this.$target[0].dataset.visibilityComparator = 'after';
} else if (['text', 'email', 'tel', 'url', 'search', 'password', 'number'].includes(dependencyEl.type)
|| dependencyEl.nodeName === 'TEXTAREA') {
this.$target[0].dataset.visibilityComparator = 'equal';
}
}
}
@@ -1312,11 +1310,7 @@ options.registry.WebsiteFieldEditor = FieldEditor.extend({
await this._fetchFieldRecords(field);
list.dataset.availableRecords = JSON.stringify(field.records);
}
if (selectDependencyEl) {
uiFragment.insertBefore(list, uiFragment.querySelector('we-select[string="Visibility"]'));
} else {
uiFragment.appendChild(list);
}
uiFragment.insertBefore(list, uiFragment.querySelector('we-select[string="Visibility"]'));
},
/**
* Replaces the target content with the field provided.