diff --git a/room/models/room_booking.py b/room/models/room_booking.py index 612c0635a..f2acf5273 100644 --- a/room/models/room_booking.py +++ b/room/models/room_booking.py @@ -22,15 +22,15 @@ class RoomBooking(models.Model): group_expand="_read_group_room_id", tracking=4) start_datetime = fields.Datetime(string="Start Datetime", required=True, tracking=2) stop_datetime = fields.Datetime(string="End Datetime", required=True, tracking=3) - organizer_id = fields.Many2one("res.users", string="Organizer", + user_id = fields.Many2one("res.users", string="Organizer", default=lambda self: self.env.user.id if not self.env.user._is_public() else False, tracking=5) office_id = fields.Many2one(related="room_id.office_id", string="Office", readonly=True, store=True) - company_id = fields.Many2one(related="organizer_id.employee_id.company_id", string="Company", readonly=True, store=True) - - department_id = fields.Many2one('hr.department', related='organizer_id.employee_id.department_id', string="部门") + company_id = fields.Many2one(related="user_id.employee_id.company_id", string="Company", readonly=True, store=True) + department_id = fields.Many2one('hr.department', related='user_id.employee_id.department_id', string="部门") is_notice = fields.Boolean(string="是否发布通知", default=True) + users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id) task_time_ids = fields.Many2many('yuthon.task.time', string='提醒') meeting_type = fields.Selection([('up', '线上'), ('down', '线下'), ('exterior', '外部')], default='down', string="会议形式", required=True) @@ -290,7 +290,7 @@ class RoomBooking(models.Model): def sync_wechat_room(self): for record in self: - admin_userid = record.organizer_id.oauth_uid + admin_userid = record.user_id.oauth_uid title = record.name meeting_start = record.start_datetime.timestamp() meeting_duration = record.stop_datetime.timestamp() - record.start_datetime.timestamp() diff --git a/room/views/room_booking_views.xml b/room/views/room_booking_views.xml index 37652a711..aac84984e 100644 --- a/room/views/room_booking_views.xml +++ b/room/views/room_booking_views.xml @@ -6,11 +6,11 @@ - + - - + + @@ -28,7 +28,7 @@ precision="{'day': 'hour:quarter', 'week': 'day:half', 'month': 'day:half', 'year': 'day:full'}" default_scale="day" dynamic_range="1" - color="organizer_id" + color="user_id" string="Bookings" plan="0"> @@ -39,7 +39,7 @@