From 135a5daeb83c3deac0a0be968d5e7cb24cfa30de Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Tue, 25 Oct 2016 10:31:59 +0200 Subject: [PATCH] [FIX] website_mail_channel: message count The message count on a mailing list looks incorrect since notifications are counted but not displayed. opw-691948 --- addons/website_mail_channel/controllers/main.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/website_mail_channel/controllers/main.py b/addons/website_mail_channel/controllers/main.py index fc03002f5b8..c78964d7743 100644 --- a/addons/website_mail_channel/controllers/main.py +++ b/addons/website_mail_channel/controllers/main.py @@ -15,7 +15,8 @@ class MailGroup(http.Controller): def _get_archives(self, group_id): MailMessage = request.env['mail.message'] groups = MailMessage._read_group_raw( - [('model', '=', 'mail.channel'), ('res_id', '=', group_id)], ['subject', 'date'], + [('model', '=', 'mail.channel'), ('res_id', '=', group_id), ('message_type', '!=', 'notification')], + ['subject', 'date'], groupby=["date"], orderby="date desc") for group in groups: (r, label) = group['date'] @@ -41,7 +42,7 @@ class MailGroup(http.Controller): # compute statistics month_date = datetime.today() - relativedelta.relativedelta(months=1) messages = request.env['mail.message'].read_group( - [('model', '=', 'mail.channel'), ('date', '>=', fields.Datetime.to_string(month_date))], + [('model', '=', 'mail.channel'), ('date', '>=', fields.Datetime.to_string(month_date)), ('message_type', '!=', 'notification')], [], ['res_id']) message_data = dict((message['res_id'], message['res_id_count']) for message in messages)