diff options
| author | XavierDo <xdo@odoo.com> | 2018-07-03 13:31:51 +0200 |
|---|---|---|
| committer | XavierDo <xdo@odoo.com> | 2018-07-11 10:11:14 +0200 |
| commit | 1b323e8b173e622adebdf2c6c2df8de759d83714 (patch) | |
| tree | 49966ce28e4ae84265579a851e7719c7ae5507ac /addons | |
| parent | dea80d7c9c7c0d93b1240e66a42403d44c738c8d (diff) | |
[FIX] calendar: fix attendee status filter
An event was shown in today's meeting if another attendees wasn't
in decilned state, even if the current user declined the event.
Task: #1858076
PR: #25544
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/calendar/models/res_users.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/addons/calendar/models/res_users.py b/addons/calendar/models/res_users.py index c0b1f1b4a44..12301d12094 100644 --- a/addons/calendar/models/res_users.py +++ b/addons/calendar/models/res_users.py @@ -26,7 +26,7 @@ class Users(models.Model): '|', ['start', '>=', fields.Datetime.to_string(start_dt)], ['stop', '>=', fields.Datetime.to_string(start_dt)], ['start', '<=', fields.Datetime.to_string(end_dt)], '&', ['allday', '=', True], ['start_date', '=', fields.Date.to_string(start_date)], - '&', ('attendee_ids.partner_id', '=', self.env.user.partner_id.id), ('attendee_ids.state', '!=', 'declined')] + ('attendee_ids.partner_id', '=', self.env.user.partner_id.id)] @api.model def systray_get_activities(self): @@ -34,8 +34,9 @@ class Users(models.Model): meetings_lines = self.env['calendar.event'].search_read( self._systray_get_calendar_event_domain(), - ['id', 'start', 'name', 'allday'], + ['id', 'start', 'name', 'allday', 'attendee_status'], order='start') + meetings_lines = [line for line in meetings_lines if line['attendee_status'] != 'declined'] if meetings_lines: meeting_label = _("Today's Meetings") meetings_systray = { |