diff options
| author | Sébastien Theys <seb@odoo.com> | 2020-06-15 18:12:21 +0000 |
|---|---|---|
| committer | Sébastien Theys <seb@odoo.com> | 2020-06-15 18:12:21 +0000 |
| commit | 3fea5b2136627c1d7e83b2a5e111952fe3eb10a1 (patch) | |
| tree | 5eefad07972a87ce4689b83260f981bc87aadad4 /addons/web/static/src/js/views | |
| parent | 0a82848606151ef60eb6523e9c4c161171f214e7 (diff) | |
[REF] mail, *: refactor messaging with OWL
This commit is a significant rewriting of client-side discuss, chatter,
chat window, and messaging menu using OWL. The behavior should be broadly
the same, with some slight functional changes here and there.
From a technical standpoint, the code of messaging is mainly organized in 2
main groups of modules:
- models, which are logical entities that depict the client-side state of
messaging as a whole.
- components, which are in charge of displaying information from models.
This refactoring also introduces new JS guidelines regarding folder structure
(/static) and naming rules for JS modules.
Community PR: https://github.com/odoo/odoo/pull/39023
Enterprise PR: https://github.com/odoo/enterprise/pull/6249
Task-1914207
This PR is a collaborative work by Alexandre, Julien, Sébastien and Xavier,
with the precious help of Lucas to speed it up towards the end.
closes odoo/odoo#39023
Related: odoo/enterprise#6249
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
Co-authored-by: Alexandre Kühn <aku@odoo.com>
Co-authored-by: Julien Giannone <jgi@odoo.com>
Co-authored-by: Lucas Perais <lpe@odoo.com>
Co-authored-by: Sébastien Theys <seb@odoo.com>
Co-authored-by: Xavier Dubuc <xdu@odoo.com>
Diffstat (limited to 'addons/web/static/src/js/views')
4 files changed, 17 insertions, 2 deletions
diff --git a/addons/web/static/src/js/views/basic/basic_renderer.js b/addons/web/static/src/js/views/basic/basic_renderer.js index 7a9693c11fc..fd285010054 100644 --- a/addons/web/static/src/js/views/basic/basic_renderer.js +++ b/addons/web/static/src/js/views/basic/basic_renderer.js @@ -816,6 +816,9 @@ var BasicRenderer = AbstractRenderer.extend(WidgetAdapterMixin, { self._registerModifiers(node, record, widget); widget.$el.addClass('o_widget'); $el.replaceWith(widget.$el); + if (self._isInDom && widget.on_attach_callback) { + widget.on_attach_callback(); + } }); return $el; diff --git a/addons/web/static/src/js/views/form/form_renderer.js b/addons/web/static/src/js/views/form/form_renderer.js index fb8e908c0e1..1927d688c2c 100644 --- a/addons/web/static/src/js/views/form/form_renderer.js +++ b/addons/web/static/src/js/views/form/form_renderer.js @@ -5,12 +5,13 @@ var BasicRenderer = require('web.BasicRenderer'); var config = require('web.config'); var core = require('web.core'); var dom = require('web.dom'); +const { WidgetAdapterMixin } = require('web.OwlCompatibility'); var viewUtils = require('web.viewUtils'); var _t = core._t; var qweb = core.qweb; -var FormRenderer = BasicRenderer.extend({ +var FormRenderer = BasicRenderer.extend(WidgetAdapterMixin, { className: "o_form_view", events: _.extend({}, BasicRenderer.prototype.events, { 'click .o_notification_box .oe_field_translate': '_onTranslate', @@ -44,9 +45,17 @@ var FormRenderer = BasicRenderer.extend({ return this._super.apply(this, arguments); }, /** + * @override + */ + destroy() { + this._super(...arguments); + WidgetAdapterMixin.destroy.call(this); + }, + /** * Called each time the form view is attached into the DOM */ on_attach_callback: function () { + WidgetAdapterMixin.on_attach_callback.call(this); this._isInDom = true; this._super.apply(this, arguments); }, @@ -54,6 +63,7 @@ var FormRenderer = BasicRenderer.extend({ * Called each time the renderer is detached from the DOM. */ on_detach_callback: function () { + WidgetAdapterMixin.on_detach_callback.call(this); this._isInDom = false; this._super.apply(this, arguments); }, @@ -1007,7 +1017,7 @@ var FormRenderer = BasicRenderer.extend({ this.$el.html($newContent); this.$el.toggleClass('o_form_nosheet', !this.has_sheet); if (this.has_sheet) { - this.$el.children().not('.oe_chatter') + this.$el.children().not('.o_FormRenderer_chatterContainer') .wrapAll($('<div/>', {class: 'o_form_sheet_bg'})); } this.$el.toggleClass('o_form_editable', this.mode === 'edit'); diff --git a/addons/web/static/src/js/views/form/form_view.js b/addons/web/static/src/js/views/form/form_view.js index ba58a131155..37cca1a0917 100644 --- a/addons/web/static/src/js/views/form/form_view.js +++ b/addons/web/static/src/js/views/form/form_view.js @@ -47,6 +47,7 @@ var FormView = BasicView.extend({ this.controllerParams.mode = mode; this.rendererParams.mode = mode; + this.rendererParams.isFromFormViewDialog = params.isFromFormViewDialog; }, //-------------------------------------------------------------------------- diff --git a/addons/web/static/src/js/views/view_dialogs.js b/addons/web/static/src/js/views/view_dialogs.js index 95a1ac9acd2..5eeab5ccede 100644 --- a/addons/web/static/src/js/views/view_dialogs.js +++ b/addons/web/static/src/js/views/view_dialogs.js @@ -200,6 +200,7 @@ var FormViewDialog = ViewDialog.extend({ model: self.model, parentID: self.parentID, recordID: self.recordID, + isFromFormViewDialog: true, }); return formview.getController(self); }).then(function (formView) { |
