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

[IMP] mail: turn 'Discuss/orderedMailboxes' into field

Browse Source 
Task-2793280

closes odoo/odoo#86444

Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
This commit is contained in:
Alexandre Kühn
2022-03-21 11:12:12 +01:00
parent 1c233c2f23
commit e15f00da76
3 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/static/src/components/discuss_mobile_mailbox_selection/discuss_mobile_mailbox_selection.js
-28
View File
@@ -10,34 +10,6 @@ export class DiscussMobileMailboxSelection extends Component {
// Public
//--------------------------------------------------------------------------
/**
* @returns {Thread[]}
*/
get orderedMailboxes() {
if (!this.messaging) {
return [];
}
return this.messaging.models['Thread']
.all(thread => thread.isPinned && thread.model === 'mail.box')
.sort((mailbox1, mailbox2) => {
if (mailbox1 === this.messaging.inbox) {
return -1;
}
if (mailbox2 === this.messaging.inbox) {
return 1;
}
if (mailbox1 === this.messaging.starred) {
return -1;
}
if (mailbox2 === this.messaging.starred) {
return 1;
}
const mailbox1Name = mailbox1.displayName;
const mailbox2Name = mailbox2.displayName;
mailbox1Name < mailbox2Name ? -1 : 1;
});
}
/**
* @returns {Discuss}
*/
addons/mail/static/src/components/discuss_mobile_mailbox_selection/discuss_mobile_mailbox_selection.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<t t-name="mail.DiscussMobileMailboxSelection" owl="1">
<div class="o_DiscussMobileMailboxSelection" t-attf-class="{{ className }}" t-ref="root">
<t t-foreach="orderedMailboxes" t-as="mailbox" t-key="mailbox.localId">
<t t-foreach="discuss.orderedMailboxes" t-as="mailbox" t-key="mailbox.localId">
<button class="o_DiscussMobileMailboxSelection_button btn btn-secondary"
t-att-class="{
'active o-active': discuss.thread === mailbox,
addons/mail/static/src/models/discuss.js
+34 -2
View File
@@ -1,8 +1,8 @@
/** @odoo-module **/
import { registerModel } from '@mail/model/model_core';
import { attr, one } from '@mail/model/model_field';
import { clear, insertAndReplace, link, unlink } from '@mail/model/model_field_command';
import { attr, many, one } from '@mail/model/model_field';
import { clear, insertAndReplace, link, replace, unlink } from '@mail/model/model_field_command';
import { escape } from '@web/core/utils/strings';
registerModel({
@@ -316,6 +316,35 @@ registerModel({
_computeNotificationListView() {
return (this.messaging.device.isMobile && this.activeMobileNavbarTabId !== 'mailbox') ? insertAndReplace() : clear();
},
/**
* @private
* @returns {FieldCommand}
*/
_computeOrderedMailboxes() {
if (!this.messaging) {
return clear();
}
const orderedMailboxes = this.messaging.models['Thread']
.all(thread => thread.isPinned && thread.model === 'mail.box')
.sort((mailbox1, mailbox2) => {
if (mailbox1 === this.messaging.inbox) {
return -1;
}
if (mailbox2 === this.messaging.inbox) {
return 1;
}
if (mailbox1 === this.messaging.starred) {
return -1;
}
if (mailbox2 === this.messaging.starred) {
return 1;
}
const mailbox1Name = mailbox1.displayName;
const mailbox2Name = mailbox2.displayName;
return mailbox1Name < mailbox2Name ? -1 : 1;
});
return replace(orderedMailboxes);
},
/**
* Only pinned threads are allowed in discuss.
*
@@ -443,6 +472,9 @@ registerModel({
inverse: 'discuss',
isCausal: true,
}),
orderedMailboxes: many('Thread', {
compute: '_computeOrderedMailboxes',
}),
/**
* Quick search input value in the discuss sidebar (desktop). Useful
* to filter channels and chats based on this input content.