From 63c325b17fb2eaf64aa2351b79afcc8db8503756 Mon Sep 17 00:00:00 2001 From: Younn Olivier Date: Mon, 23 May 2022 13:28:10 +0200 Subject: [PATCH] [FIX] website_sale: fix products header edition This commit adapts [1] to the new wysiwyg adapter component. [1]: https://github.com/odoo/odoo/commit/ce067c3b56ca8551f2904f7e91313ebde344a57b See merge commit for more information. task-2687506 --- addons/website_sale/__manifest__.py | 1 + .../wysiwyg_adapter/wysiwyg_adapter.js | 21 ++++++++++++++++ .../static/src/js/website_sale.editor.js | 25 ------------------- 3 files changed, 22 insertions(+), 25 deletions(-) create mode 100644 addons/website_sale/static/src/js/components/wysiwyg_adapter/wysiwyg_adapter.js diff --git a/addons/website_sale/__manifest__.py b/addons/website_sale/__manifest__.py index 079fe180a4f..6b365ad7eed 100644 --- a/addons/website_sale/__manifest__.py +++ b/addons/website_sale/__manifest__.py @@ -75,6 +75,7 @@ ], 'website.assets_editor': [ 'website_sale/static/src/js/systray_items/*.js', + 'website_sale/static/src/js/components/wysiwyg_adapter/wysiwyg_adapter.js', 'website_sale/static/src/js/website_sale_form_editor.js', ], 'web.assets_common': [ diff --git a/addons/website_sale/static/src/js/components/wysiwyg_adapter/wysiwyg_adapter.js b/addons/website_sale/static/src/js/components/wysiwyg_adapter/wysiwyg_adapter.js new file mode 100644 index 00000000000..d794765fce7 --- /dev/null +++ b/addons/website_sale/static/src/js/components/wysiwyg_adapter/wysiwyg_adapter.js @@ -0,0 +1,21 @@ +/** @odoo-module **/ + +import { WysiwygAdapterComponent } from '@website/components/wysiwyg_adapter/wysiwyg_adapter'; +import { patch } from 'web.utils'; + +patch(WysiwygAdapterComponent.prototype, 'website_sale_wysiwyg_adapter', { + /** + * @override + */ + _getContentEditableAreas() { + return $(this.websiteService.pageDocument).find(this.savableSelector).not('input, [data-oe-readonly],[data-oe-type="monetary"],[data-oe-many2one-id], [data-oe-field="arch"]:empty').filter((_, el) => { + return !$(el).closest('.o_not_editable, .oe_website_sale .products_header').length; + }).toArray(); + }, + /** + * @override + */ + _getReadOnlyAreas() { + return $(this.websiteService.pageDocument).find("#wrapwrap").find('.oe_website_sale .products_header, .oe_website_sale .products_header a').toArray(); + }, +}); diff --git a/addons/website_sale/static/src/js/website_sale.editor.js b/addons/website_sale/static/src/js/website_sale.editor.js index d0b727bfeab..74ca08e79cd 100644 --- a/addons/website_sale/static/src/js/website_sale.editor.js +++ b/addons/website_sale/static/src/js/website_sale.editor.js @@ -1,28 +1,3 @@ -odoo.define('website_sale.editMenu', function (require) { - 'use strict'; - -var WebsiteEditMenu = require('website.editMenu'); - -WebsiteEditMenu.include({ - /** - * @override - */ - _getContentEditableAreas () { - return $(this.savableSelector).not('input, [data-oe-readonly],[data-oe-type="monetary"],[data-oe-many2one-id], [data-oe-field="arch"]:empty').filter((_, el) => { - return !$(el).closest('.o_not_editable, .oe_website_sale .products_header').length; - }).toArray(); - }, - /** - * @override - */ - _getReadOnlyAreas () { - return $("#wrapwrap").find('.oe_website_sale .products_header, .oe_website_sale .products_header a').toArray(); - }, -}); -}); - -//============================================================================== - odoo.define('website_sale.editor', function (require) { 'use strict';