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

[IMP] mail: simplify conditions that control chatter position

Browse Source 
This better highlights the different cases that need to be handled.

Part of task-2871070

Part-of: odoo/odoo#95323
This commit is contained in:
Sébastien Theys
2022-07-05 16:20:43 +02:00
parent 6da6add464
commit d8fc0e07b9
1 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/static/src/widgets/form_renderer/form_renderer.js
+18 -24
View File
@@ -156,31 +156,25 @@ FormRenderer.include({
*/
_interchangeChatter() {
const $sheetBg = this.$('.o_form_sheet_bg');
if (this._isChatterAside()) {
this._chatterContainerTarget.classList.add('o-aside');
this._chatterContainerTarget.classList.remove('o-isInFormSheetBg');
$(this._chatterContainerTarget).insertAfter($sheetBg);
} else {
this._chatterContainerTarget.classList.remove('o-aside');
if (this.isChatterInSheet) {
this._chatterContainerTarget.classList.remove('o-isInFormSheetBg');
const $sheet = this.$('.o_form_sheet');
dom.append($sheet, $(this._chatterContainerTarget), {
callbacks: [],
in_DOM: this._isInDom,
});
} else {
if (this.hasAttachmentViewer()) {
this._chatterContainerTarget.classList.add('o-isInFormSheetBg');
dom.append($sheetBg, $(this._chatterContainerTarget), {
callbacks: [],
in_DOM: this._isInDom,
});
} else {
this._chatterContainerTarget.classList.remove('o-isInFormSheetBg');
$(this._chatterContainerTarget).insertAfter($sheetBg);
}
this._chatterContainerTarget.classList.remove('o-aside');
this._chatterContainerTarget.classList.remove('o-isInFormSheetBg');
if (this.isChatterInSheet) { // in sheet
const $sheet = this.$('.o_form_sheet');
dom.append($sheet, $(this._chatterContainerTarget), {
callbacks: [],
in_DOM: this._isInDom,
});
} else if (this.hasAttachmentViewer()) { // in sheet-bg
this._chatterContainerTarget.classList.add('o-isInFormSheetBg');
dom.append($sheetBg, $(this._chatterContainerTarget), {
callbacks: [],
in_DOM: this._isInDom,
});
} else { // after sheet-bg
if (this._isChatterAside()) {
this._chatterContainerTarget.classList.add('o-aside');
}
$(this._chatterContainerTarget).insertAfter($sheetBg);
}
if (this.hasAttachmentViewer()) {
$(this.attachmentViewerTarget).insertAfter($sheetBg);