From 24a36c6c8f07dde105b1c2ccfcfcb58d934ac06f Mon Sep 17 00:00:00 2001 From: Arnaud Joset Date: Tue, 29 Jun 2021 14:55:13 +0000 Subject: [PATCH] [IMP] calendar: rename calendar.contacts model Before this commit, the 'magic' model calendar.contacts name was misleading. This model is only used to save calendar view preferences in the calendar app. As the calendar events are already mentionning attendees, partners, users, the 'contact' name for a technical field was confusing. Taskid: 2484335 Part-of: odoo/odoo#68700 --- addons/calendar/data/calendar_demo.xml | 4 ++-- addons/calendar/models/__init__.py | 2 +- addons/calendar/models/calendar_event.py | 2 +- addons/calendar/models/calendar_filter.py | 4 ++-- addons/calendar/security/ir.model.access.csv | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/calendar/data/calendar_demo.xml b/addons/calendar/data/calendar_demo.xml index b6fd1077717..6a2b68a5527 100644 --- a/addons/calendar/data/calendar_demo.xml +++ b/addons/calendar/data/calendar_demo.xml @@ -2,13 +2,13 @@ - + - + diff --git a/addons/calendar/models/__init__.py b/addons/calendar/models/__init__.py index 89acd141801..536dde9919d 100644 --- a/addons/calendar/models/__init__.py +++ b/addons/calendar/models/__init__.py @@ -7,7 +7,7 @@ from . import calendar_event from . import calendar_alarm from . import calendar_alarm_manager from . import calendar_attendee -from . import calendar_contact +from . import calendar_filter from . import calendar_event_type from . import calendar_recurrence from . import mail_activity diff --git a/addons/calendar/models/calendar_event.py b/addons/calendar/models/calendar_event.py index 4889da9547d..23880e8f067 100644 --- a/addons/calendar/models/calendar_event.py +++ b/addons/calendar/models/calendar_event.py @@ -790,7 +790,7 @@ class Meeting(models.Model): if my_attendee: return my_attendee[:1] - event_checked_attendees = self.env['calendar.contacts'].search([ + event_checked_attendees = self.env['calendar.filters'].search([ ('user_id', '=', self.env.user.id), ('partner_id', 'in', self.attendee_ids.partner_id.ids), ('partner_checked', '=', True) diff --git a/addons/calendar/models/calendar_filter.py b/addons/calendar/models/calendar_filter.py index 9a8a002872a..e1bb3b25d46 100644 --- a/addons/calendar/models/calendar_filter.py +++ b/addons/calendar/models/calendar_filter.py @@ -5,8 +5,8 @@ from odoo import api, fields, models class Contacts(models.Model): - _name = 'calendar.contacts' - _description = 'Calendar Contacts' + _name = 'calendar.filters' + _description = 'Calendar Filters' user_id = fields.Many2one('res.users', 'Me', required=True, default=lambda self: self.env.user) partner_id = fields.Many2one('res.partner', 'Employee', required=True) diff --git a/addons/calendar/security/ir.model.access.csv b/addons/calendar/security/ir.model.access.csv index 48e529ade2d..5a3b8812f1d 100644 --- a/addons/calendar/security/ir.model.access.csv +++ b/addons/calendar/security/ir.model.access.csv @@ -8,6 +8,6 @@ access_calendar_event_partner_manager,calendar.event.partner.manager,model_calen access_calendar_event_type_all,calendar.event.type.all,model_calendar_event_type,base.group_user,1,0,0,0 access_calendar_event_type_manager,calendar.event.type.manager,model_calendar_event_type,base.group_system,1,1,1,1 access_calendar_alarm_manager,access_calendar_alarm_manager,model_calendar_alarm_manager,base.group_user,1,1,1,1 -access_calendar_contacts_all,access_calendar_contacts_all,model_calendar_contacts,base.group_user,1,1,1,1 -access_calendar_contacts,access_calendar_contacts,model_calendar_contacts,base.group_system,1,1,1,1 +access_calendar_filters_all,access_calendar_contacts_all,model_calendar_filters,base.group_user,1,1,1,1 +access_calendar_filters,access_calendar_contacts,model_calendar_filters,base.group_system,1,1,1,1 access_calendar_recurrence,access_calendar_recurrence,model_calendar_recurrence,base.group_user,1,1,1,1