Skip to content

[FIX] mail: Sort mail.message by date instead of id. #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 18.0
Choose a base branch
from
Open

[FIX] mail: Sort mail.message by date instead of id. #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/mail/controllers/thread.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def mail_thread_messages(self, thread_model, thread_id, search_term=None, before
("model", "=", thread_model),
("message_type", "!=", "user_notification"),
]
res = request.env["mail.message"]._message_fetch(domain, search_term=search_term, before=before, after=after, around=around, limit=limit)
res = request.env["mail.message"].with_context(is_chatter_view=True)._message_fetch(domain, search_term=search_term, before=before, after=after, around=around, limit=limit)
messages = res.pop("messages")
if not request.env.user._is_public():
messages.set_message_done()
Expand Down
28 changes: 18 additions & 10 deletions addons/mail/models/mail_message.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,17 +1102,25 @@ def _message_fetch(self, domain, search_term=None, before=None, after=None, arou
[("subtype_id.description", "ilike", search_term)],
])])
res["count"] = self.search_count(domain)
if around is not None:
messages_before = self.search(domain=[*domain, ('id', '<=', around)], limit=limit // 2, order="id DESC")
messages_after = self.search(domain=[*domain, ('id', '>', around)], limit=limit // 2, order='id ASC')
return {**res, "messages": (messages_after + messages_before).sorted('id', reverse=True)}
if before:
domain = expression.AND([domain, [('id', '<', before)]])
if after:
domain = expression.AND([domain, [('id', '>', after)]])
res["messages"] = self.search(domain, limit=limit, order='id ASC' if after else 'id DESC')

def _domain(message, date_oper, id_oper):
return expression.OR([
[('date', date_oper, message.date)],
expression.AND([
[('date', '=', message.date)],
[('id', id_oper, message.id)]])])

if around and (around := self.browse(around)):
messages_before = self.search(expression.AND([domain, _domain(around, '<', '<=')]), limit=limit // 2, order='date DESC, id DESC')
messages_after = self.search(expression.AND([domain, _domain(around, '>', '>')]), limit=limit // 2, order='date ASC, id ASC').sorted(lambda m: (m.date, m.id), reverse=True)
return {**res, "messages": (messages_after + messages_before)}
if before and (before := self.browse(before)):
domain = expression.AND([domain, _domain(before, '<', '<')])
if after and (after := self.browse(after)):
domain = expression.AND([domain, _domain(after, '>', '>')])
res["messages"] = self.search(domain, limit=limit, order='date ASC, id ASC' if after else 'date DESC, id DESC')
if after:
res["messages"] = res["messages"].sorted('id', reverse=True)
res["messages"] = res["messages"].sorted(lambda m: (m.date, m.id), reverse=True)
return res

def _message_notifications_to_store(self, store: Store):
Expand Down