!319 pengyuthon

Merge pull request !319 from 李鹏宇/dev

yuthon_issue/models/inherit_room_booking.py

@@ -1,6 +1,4 @@
 from odoo import api, fields, models, _
-from odoo.odoo.tools import named_to_positional_printf
-from odoo.odoo.tools.view_validation import relaxng
 
 
 class RoomBooking(models.Model):

yuthon_issue/security/ir.model.access.csv

@@ -1,15 +1,10 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_issue_library,issue_library,model_issue_library,base.group_user,1,1,1,1
 access_issue_library_line,issue_library_line,model_issue_library_line,base.group_user,1,1,1,1
 access_issue_approval_decision,issue_approval_decision,model_issue_approval_decision,base.group_user,1,1,1,1
 access_issue_approval_decision_type,issue_approval_decision_type,model_issue_approval_decision_type,base.group_user,1,1,1,1
 access_issue_library_approval_line,issue_library_approval_line,model_issue_library_approval_line,base.group_user,1,1,1,1
 access_issue_approval,issue_approval,model_issue_approval,base.group_user,1,1,1,1
 access_issue_approval_line,issue_approval_line,model_issue_approval_line,base.group_user,1,1,1,1
-access_issue_library,issue_library,model_issue_library,base.group_user,1,1,1,1
-access_issue_meeting_minutes_line,issue_meeting_minutes_line,model_issue_meeting_minutes_line,base.group_user,1,1,1,1
 access_issue_meeting_minutes,issue_meeting_minutes,model_issue_meeting_minutes,base.group_user,1,1,1,1
-
-access_issue_library,issue_library,model_issue_library,group_topic_admin,1,1,1,1
-access_issue_library,issue_library,model_issue_library,group_party_topic,1,1,1,1
-access_issue_library,issue_library,model_issue_library,group_team_topic,1,1,1,1
-access_issue_library,issue_library,model_issue_library,group_board_topic,1,1,1,1
+access_issue_meeting_minutes_line,issue_meeting_minutes_line,model_issue_meeting_minutes_line,base.group_user,1,1,1,1

yuthon_issue/security/issue_security_group.xml

@@ -1,32 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record id="module_category_issue_library" model="ir.module.category">
-        <field name="name">议题权限</field>
-    </record>
+    <data noupdate="0">
+        <record id="module_category_issue_library" model="ir.module.category">
+            <field name="name">议题权限</field>
+        </record>
 
-    <!-- 党支委议题群组 -->
-    <record id="group_party_topic" model="res.groups">
-        <field name="name">党支委议题</field>
-        <field name="category_id" ref="module_category_issue_library"/>
-    </record>
+        <!-- 党支委议题群组 -->
+        <record id="group_party_topic" model="res.groups">
+            <field name="name">党支委议题</field>
+            <field name="category_id" ref="module_category_issue_library"/>
+        </record>
 
-    <!-- 班子会议题群组 -->
-    <record id="group_team_topic" model="res.groups">
-        <field name="name">班子会议题</field>
-        <field name="category_id" ref="module_category_issue_library"/>
-    </record>
+        <!-- 班子会议题群组 -->
+        <record id="group_team_topic" model="res.groups">
+            <field name="name">班子会议题</field>
+            <field name="category_id" ref="module_category_issue_library"/>
+        </record>
 
-    <!-- 董事会议题群组 -->
-    <record id="group_board_topic" model="res.groups">
-        <field name="name">董事会议题</field>
-        <field name="category_id" ref="module_category_issue_library"/>
-    </record>
+        <!-- 董事会议题群组 -->
+        <record id="group_board_topic" model="res.groups">
+            <field name="name">董事会议题</field>
+            <field name="category_id" ref="module_category_issue_library"/>
+        </record>
 
-    <!-- 议题管理员群组 -->
-    <record id="group_topic_admin" model="res.groups">
-        <field name="name">议题管理员</field>
-        <field name="category_id" ref="module_category_issue_library"/>
-        <field name="implied_ids" eval="[(4, ref('group_party_topic')), (4, ref('group_team_topic')), (4, ref('group_board_topic'))]"/>
-        <field name="users" eval="[(4, ref('base.user_admin'))]"/>
-    </record>
+        <!-- 议题管理员群组 -->
+        <record id="group_topic_admin" model="res.groups">
+            <field name="name">议题管理员</field>
+            <field name="category_id" ref="module_category_issue_library"/>
+            <field name="implied_ids" eval="[(4, ref('group_party_topic')), (4, ref('group_board_topic')), (4, ref('group_team_topic'))]"/>
+            <field name="users" eval="[(4, ref('base.user_admin'))]"/>
+        </record>
+    </data>
 </odoo>

yuthon_issue/views/issue_meeting_minutes_views.xml

@@ -37,7 +37,10 @@
                         </page>
                     </notebook>
                     <group>
-                        <field name="notice_documents_ids" widget="many2many_tags"/>
+                        <group>
+                            <field name="notice_documents_ids" widget="preview_many2many"/>
+                        </group>
+                        <group/>
                     </group>
                 </sheet>
             </form>

yuthon_issue/views/menus.xml

@@ -9,7 +9,7 @@
     <menuitem id="tianhe_issue_library_menu"
               parent="tianhe_issue_library_menu_root"
               name="议题库"
-              groups="group_topic_admin"
+              groups="yuthon_issue.group_topic_admin"
               sequence="1"/>
 
     <menuitem id="tianhe_issue_library_all"
@@ -111,7 +111,7 @@
     <menuitem id="tianhe_issue_library_menu_root3"
               name="党之委议题库"
               parent="tianhe_issue_library_menu_root"
-              groups="group_party_topic"
+              groups="yuthon_issue.group_party_topic"
               sequence="3"/>
 
     <menuitem id="issue_library_menu3"