!7910 添加功能

Merge pull request !7910 from 李鹏宇/dev_zhou

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()

room/views/room_booking_views.xml

@@ -6,11 +6,11 @@
         <field name="arch" type="xml">
             <search string="Booking">
                 <field name="name" string="Meeting name"/>
-                <field name="organizer_id"/>
+                <field name="user_id"/>
                 <field name="room_id"/>
                 <field name="office_id"/>
-                <filter name="organizer_id" string="My Meetings" domain="[('organizer_id', '=', uid)]"/>
-                <filter name="group_by_organizer_id" context="{'group_by': 'organizer_id'}"/>
+                <filter name="user_id" string="My Meetings" domain="[('user_id', '=', uid)]"/>
+                <filter name="group_by_user_id" context="{'group_by': 'user_id'}"/>
                 <filter name="group_by_room_id" context="{'group_by': 'room_id'}"/>
                 <filter name="group_by_office_id" context="{'group_by': 'office_id'}"/>
             </search>
@@ -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">
                 <templates>
@@ -39,7 +39,7 @@
                             <ul class="ps-1 mb-0 list-unstyled">
                                 <li>
                                     <strong>创建人:</strong>
-                                    <t t-out="organizer_id[1]"/>
+                                    <t t-out="user_id[1]"/>
                                 </li>
                                 <li class="o_gantt_popover_content_item mt-2">
                                     <t t-out="start_datetime.toFormat('f ')"/>
@@ -78,7 +78,7 @@
                 <field name="stop_datetime"/>
                 <field name="name" string="Name"/>
                 <field name="room_id"/>
-                <field name="organizer_id" widget="many2one_avatar_user"/>
+                <field name="user_id" widget="many2one_avatar_user"/>
             </tree>
         </field>
     </record>
@@ -113,7 +113,7 @@
                             <div class="o_kanban_record_bottom">
                                 <div class="oe_kanban_bottom_left"/>
                                 <div class="oe_kanban_bottom_right">
-                                    <field name="organizer_id" widget="many2one_avatar_user"/>
+                                    <field name="user_id" widget="many2one_avatar_user"/>
                                 </div>
                             </div>
                         </div>
@@ -175,7 +175,7 @@
                             <field name="state" invisible="1"/>
                             <field name="is_back" invisible="1"/>
                             <field name="work_end" invisible="1"/>
-                            <field name="organizer_id" options="{'no_create': True}"/>
+                            <field name="user_id" options="{'no_create': True}"/>
                             <field name="meeting_type"/>
                             <field name="driver" invisible="meeting_type != 'exterior'"/>
                             <field name="fleet_id" invisible="meeting_type != 'exterior'"/>