From 096a6e72a9344f7e7b8ae41d7688b11bf98354fe Mon Sep 17 00:00:00 2001 From: Younn Olivier Date: Wed, 8 Sep 2021 13:45:20 +0000 Subject: [PATCH] [FIX] website: only display website languages for conditional visibility The languages displayed for the ConditionalVisibility option are now the ones available for the website. The select widget is hidden if there is only one. task-2629245 closes odoo/odoo#76537 X-original-commit: 380edf50bd1d8d1f7b1a33fd4fa1ad70dbc12804 Signed-off-by: Romain Derie (rde) Signed-off-by: Quentin Smetz (qsm) --- .../static/src/js/editor/snippets.options.js | 2 +- addons/website/views/snippets/snippets.xml | 22 +++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/addons/web_editor/static/src/js/editor/snippets.options.js b/addons/web_editor/static/src/js/editor/snippets.options.js index 7abb8c2a851..8e02efdf2f4 100644 --- a/addons/web_editor/static/src/js/editor/snippets.options.js +++ b/addons/web_editor/static/src/js/editor/snippets.options.js @@ -1900,7 +1900,7 @@ const ListUserValueWidget = UserValueWidget.extend({ if (this.createWidget) { const selectedIds = currentValues.map(({ id }) => id) .filter(id => typeof id === 'number'); - this.createWidget.options.domain = ['!', ['id', 'in', selectedIds]]; + this.createWidget.options.domain = [...this.createWidget.options.domain, ['id', 'not in', selectedIds]]; this.createWidget.setValue(''); this.createWidget.inputEl.value = ''; $(this.createWidget.inputEl).trigger('input'); diff --git a/addons/website/views/snippets/snippets.xml b/addons/website/views/snippets/snippets.xml index 5aa65d280c5..c5770e796e4 100644 --- a/addons/website/views/snippets/snippets.xml +++ b/addons/website/views/snippets/snippets.xml @@ -317,7 +317,7 @@ t-att-data-save-attribute="save_attribute" t-att-data-attribute-name="attribute_name" data-no-preview="true" - t-att-data-model="model" t-att-data-call-with="call_with" data-select-record="" t-att-data-fields="data_fields" + t-att-data-model="model" t-att-data-call-with="call_with" data-select-record="" t-att-data-fields="data_fields" t-att-data-domain="domain" data-allow-delete="true" data-fakem2m="true"/> @@ -1132,6 +1132,7 @@
+ Always visible @@ -1149,14 +1150,17 @@ ["code"] - - ⌙ Languages - visibilityValueLangRule - visibilityValueLang - lang - res.lang - code - ["code"] + + + ⌙ Languages + visibilityValueLangRule + visibilityValueLang + lang + res.lang + code + [["id", "in", ]] + ["code"] + ⌙ UTM Campaign