From c471fe95bca90763a4c13fc33e05f8063c2b64e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Thu, 17 Sep 2026 16:28:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=95=99=E8=82=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 college/data/shixun_module_data.xml     |  4 +---
 college/views/course_views.xml          |  7 ++++--
 college/views/exam_views.xml            |  4 +---
 college/views/menus.xml                 |  7 +-----
 college/views/shixun_kanban_view.xml    |  4 ++--
 odoosh_connector/views/odoosh_menus.xml | 32 ++++---------------------
 6 files changed, 15 insertions(+), 43 deletions(-)

diff --git a/college/data/shixun_module_data.xml b/college/data/shixun_module_data.xml
index b732bd7..96d6d66 100644
--- a/college/data/shixun_module_data.xml
+++ b/college/data/shixun_module_data.xml
@@ -16,9 +16,7 @@
                10=Productivity(生产力)  11=Calendar(日历)
                20=Uncategorized(未分类)
              如需保留/恢复某类目，从下面列表中删除对应 id 即可。 -->
-        <!-- 默认隐藏 Odoo 官方默认程序（module_origin='official'），仅显示本地/第三方应用；
-             如需临时查看官方应用，可在搜索面板点「系统原生」过滤器。 -->
-        <field name="domain">[('module_origin', '!=', 'official'), ('application', '=', True), ('category_id', 'not in', [13, 54, 71, 15, 94, 6, 10, 11, 20])]</field>
+        <field name="domain">[('application', '=', True), ('category_id', 'not in', [13, 54, 71, 15, 94, 6, 10, 11, 20])]</field>
         <field name="context">{}</field>
         <field name="search_view_id" ref="shixun_module_search_view"/>
         <field name="limit">50</field>
diff --git a/college/views/course_views.xml b/college/views/course_views.xml
index 8320390..2840dcb 100644
--- a/college/views/course_views.xml
+++ b/college/views/course_views.xml
@@ -209,8 +209,7 @@
         <field name="name">yuthon.school.course.kanban</field>
         <field name="model">yuthon.school.course</field>
         <field name="arch" type="xml">
-            <kanban default_group_by="state"
-                    default_order="semester,college,name"
+            <kanban default_order="semester,college,name"
                     class="college-course-kanban college-kanban-teacher o_kanban_mobile">
                 <field name="name"/>
                 <field name="college"/>
@@ -233,6 +232,10 @@
                                       style="font-size:10px; background:rgba(255,255,255,.25); padding:3px 8px; border-radius:6px;">
                                     <field name="course_type"/>
                                 </span>
+                                <span class="badge text-white"
+                                      style="font-size:10px; background:rgba(34,197,94,.9); padding:3px 8px; border-radius:6px;">
+                                    <field name="state"/>
+                                </span>
                             </div>
                             <!-- 主体 -->
                             <div class="college-kanban-body" style="padding:10px 14px;">
diff --git a/college/views/exam_views.xml b/college/views/exam_views.xml
index d5ff8e9..0e0c86e 100644
--- a/college/views/exam_views.xml
+++ b/college/views/exam_views.xml
@@ -30,9 +30,9 @@
         <field name="arch" type="xml">
             <form>
                 <sheet>
+                    <field name="question_text" widget="html" string="题干" required="1"/>
                     <group>
                         <group>
-                            <field name="name"/>
                             <field name="question_type"/>
                             <field name="difficulty"/>
                             <field name="score"/>
@@ -44,7 +44,6 @@
                             <field name="teacher_id" readonly="1"/>
                         </group>
                     </group>
-                    <field name="question_text" widget="html" string="题干"/>
                     <notebook>
                         <page string="选项" name="options"
                               invisible="question_type not in ('single_choice','multiple_choice')">
@@ -82,7 +81,6 @@
         <field name="model">yuthon.school.exam.question</field>
         <field name="arch" type="xml">
             <search>
-                <field name="name"/>
                 <field name="question_text"/>
                 <field name="course_id"/>
                 <field name="chapter_id"/>
diff --git a/college/views/menus.xml b/college/views/menus.xml
index 25016ae..e8e78e6 100644
--- a/college/views/menus.xml
+++ b/college/views/menus.xml
@@ -22,11 +22,6 @@
               web_icon="college,static/src/img/training.png"
               sequence="1"
               groups="college.group_teacher,college.group_student,base.group_system"/>
-    <menuitem id="menu_yuthon_training_overview"
-              name="实训概览"
-              parent="menu_yuthon_training"
-              action="action_yuthon_school_training"
-              sequence="10"/>
 
     <!-- ===================== 我的课程（统一入口，按用户角色路由） ===================== -->
     <!-- 老师 / 管理员 → action_yuthon_school_course_my（老师端我的课程） -->
@@ -57,7 +52,7 @@ else:
               web_icon="college,static/src/img/my_course.png"
               action="action_yuthon_school_course_my"
               sequence="4"
-              groups="college.group_teacher,base.group_system"/>
+              groups="college.group_teacher"/>
 
     <!-- ===================== 隐藏 Odoo 默认「讨论」菜单 ===================== -->
     <record id="mail.menu_root_discuss" model="ir.ui.menu">
diff --git a/college/views/shixun_kanban_view.xml b/college/views/shixun_kanban_view.xml
index 1144ea5..1799357 100644
--- a/college/views/shixun_kanban_view.xml
+++ b/college/views/shixun_kanban_view.xml
@@ -62,8 +62,8 @@
                 <filter name="official" string="系统原生" domain="[('module_origin', '=', 'official')]"/>
                 <filter name="local" string="本地模块" domain="[('module_origin', '=', 'local')]"/>
             </xpath>
-            <!-- 移除左侧搜索面板（应用/类别两列 facet），只保留搜索栏过滤器 -->
-            <xpath expr="//searchpanel" position="replace"/>
+            <!-- 隐藏搜索面板「应用」组（全部/官方应用程序/行业，来自 base_import_module 的 module_type facet），保留「类别」列 -->
+            <xpath expr="//searchpanel/field[@name='module_type']" position="replace"/>
         </field>
     </record>
 </odoo>
diff --git a/odoosh_connector/views/odoosh_menus.xml b/odoosh_connector/views/odoosh_menus.xml
index c0092ca..73c0065 100644
--- a/odoosh_connector/views/odoosh_menus.xml
+++ b/odoosh_connector/views/odoosh_menus.xml
@@ -1,30 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-
-    <menuitem id="menu_odoosh_root"
-              name="实验环境"
-              parent="college.menu_yuthon_training"
-              sequence="20"
-              groups="base.group_user"/>
-
-    <menuitem id="menu_odoosh_my_env"
-              name="My Environment"
-              parent="menu_odoosh_root"
-              action="action_odoosh_my_env"
-              sequence="10"
-              groups="base.group_user"/>
-
-    <menuitem id="menu_odoosh_admin"
-              name="Administration"
-              parent="menu_odoosh_root"
-              sequence="90"
-              groups="odoosh_connector.group_odoosh_teacher,base.group_system"/>
-
-    <menuitem id="menu_odoosh_sync_log"
-              name="Sync Queue"
-              parent="menu_odoosh_admin"
-              action="action_odoosh_sync_log"
-              sequence="10"
-              groups="odoosh_connector.group_odoosh_teacher,base.group_system"/>
-
+    <!-- 让「我的实训」直接打开「我的实验环境」(My Lab Environment)，
+         去掉中间的「实验环境」子菜单层。 -->
+    <menuitem id="college.menu_yuthon_training"
+              name="我的实训"
+              action="action_odoosh_my_env"/>
 </odoo>
-- 
2.34.1