diff options
| author | Michael Mattiello (mcm) <mcm@odoo.com> | 2020-04-15 12:09:56 +0000 |
|---|---|---|
| committer | Michael Mattiello (mcm) <mcm@odoo.com> | 2020-04-16 07:19:55 +0000 |
| commit | f0aa343fe2d5680b27895e13b9962b3c4a9b9881 (patch) | |
| tree | 1430c2eeb45df9c3c3680b971ff0fdccfd8e63a7 /addons/mail/static/src/js | |
| parent | dcf9a4c38da5d50a6e597d3d68c3d46fdef61df5 (diff) | |
[REF] web,mail: use patchMixin and patch instead of utils.patch
This commit replaces the use of utils.patch by the new class patcher and
makes the renderers that are converted to owl patchable.
closes odoo/odoo#47700
Related: odoo/enterprise#9551
Signed-off-by: Géry Debongnie (ged) <ged@openerp.com>
Diffstat (limited to 'addons/mail/static/src/js')
| -rw-r--r-- | addons/mail/static/src/js/custom_filter_item.js | 7 | ||||
| -rw-r--r-- | addons/mail/static/src/js/views/activity/activity_renderer.js | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/addons/mail/static/src/js/custom_filter_item.js b/addons/mail/static/src/js/custom_filter_item.js index b828d0f44f6..abe15edab94 100644 --- a/addons/mail/static/src/js/custom_filter_item.js +++ b/addons/mail/static/src/js/custom_filter_item.js @@ -2,9 +2,8 @@ odoo.define('mail.CustomFilterItem', function (require) { "use strict"; const CustomFilterItem = require('web.CustomFilterItem'); - const utils = require('web.utils'); - utils.patch(CustomFilterItem, 'mail.CustomFilterItem', { + CustomFilterItem.patch('mail.CustomFilterItem', T => class extends T { /** * With the `mail` module installed, we want to filter out some of the @@ -12,10 +11,10 @@ odoo.define('mail.CustomFilterItem', function (require) { * @override */ _validateField(field) { - return this._super(...arguments) && + return super._validateField(...arguments) && field.relation !== 'mail.message' && field.name !== 'message_ids'; - }, + } }); return CustomFilterItem; diff --git a/addons/mail/static/src/js/views/activity/activity_renderer.js b/addons/mail/static/src/js/views/activity/activity_renderer.js index 3e697dd11e6..40f2ef453b8 100644 --- a/addons/mail/static/src/js/views/activity/activity_renderer.js +++ b/addons/mail/static/src/js/views/activity/activity_renderer.js @@ -7,6 +7,7 @@ const ActivityRecord = require('mail.ActivityRecord'); const { ComponentAdapter } = require('web.OwlCompatibility'); const core = require('web.core'); const KanbanColumnProgressBar = require('web.KanbanColumnProgressBar'); +const patchMixin = require('web.patchMixin'); const QWeb = require('web.QWeb'); const session = require('web.session'); const utils = require('web.utils'); @@ -204,6 +205,6 @@ ActivityRenderer.components = { }; ActivityRenderer.template = 'mail.ActivityRenderer'; -return ActivityRenderer; +return patchMixin(ActivityRenderer); }); |
