!308 zhou

Merge pull request !308 from 李鹏宇/dev_zhou

room/models/room_booking.py

@@ -53,6 +53,17 @@ class RoomBooking(models.Model):
     # 关联流程
     relevancy_type = fields.Selection([('none', '无')], string="关联流程类型")
 
+    #打开选择范围弹窗
+    def open_select_range_wizard(self):
+        return {
+            'name': '选择范围',
+            'type': 'ir.actions.act_window',
+            'view_mode': 'form',
+            'res_model': 'room.select.range.wizard',
+            'target': 'new',
+            'context': {'default_room_booking_id': self.id},
+        }
+
     @api.model_create_multi
     def create(self, vals_list):
         bookings = super(RoomBooking, self).create(vals_list)

room/views/room_booking_views.xml

@@ -152,7 +152,10 @@
                             <field name="meeting_type_id" required="1"/>
                         </group>
                     </group>
-                    <group name="meeting">
+                         <div>
+                            <button name="open_select_range_wizard" type="object">参与范围</button>
+                        </div>
+                        <group>
                         <group>
                             <field name="room_users_ids" widget="many2many_tags"/>
                             <field name="partner_ids" widget="many2many_tags" force_save="1" invisible="1"/>
@@ -162,7 +165,6 @@
                             <field name="is_day" invisible="not is_notice"/>
                         </group>
                         <group>
-
                         </group>
                 </group>
                 <notebook>

yuthon_issue/models/inherit_room_booking.py

@@ -7,14 +7,4 @@ class RoomBooking(models.Model):
 
     room_booking_library_ids = fields.One2many('issue.library', 'room_booking_id')
     decision_results = fields.Selection([('agree', '通过'), ('disagree', '未通过')], string="决策结果")
-    select_range_id = fields.Many2one('room.select.range.wizard', string="选择人员范围")
 
-    def open_select_range_wizard(self):
-        return {
-            'name': '选择范围',
-            'type': 'ir.actions.act_window',
-            'view_mode': 'form',
-            'res_model': 'room.select.range.wizard',
-            'target': 'new',
-            'context': {'default_room_booking_id': self.id},
-        }

yuthon_issue/views/inherit_room_booking.xml

@@ -19,11 +19,6 @@
                     </field>
                 </page>
             </xpath>
-            <xpath expr="//group[@name='meeting']" position="before">
-             <div>
-                 <button name="open_select_range_wizard" type="object">参与范围</button>
-             </div>
-            </xpath>
         </field>
     </record>
 </odoo>