From 57be2e5ecb5c92a3be2abb3056b6d60daa8f2350 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Fri, 23 May 2025 17:16:57 +0800 Subject: [PATCH 1/3] 1 --- ks_dashboard_ninja/static/src/js/ks_dashboard_ninja_new.js | 2 +- .../static/src/xml/ks_dashboard_ninja_templates.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ks_dashboard_ninja/static/src/js/ks_dashboard_ninja_new.js b/ks_dashboard_ninja/static/src/js/ks_dashboard_ninja_new.js index 0e7d5aedd..4edd4213a 100644 --- a/ks_dashboard_ninja/static/src/js/ks_dashboard_ninja_new.js +++ b/ks_dashboard_ninja/static/src/js/ks_dashboard_ninja_new.js @@ -216,7 +216,7 @@ export class KsDashboardNinja extends Component { grid_initiate(){ var self=this; const ks_element = this.main_body.el; - var $gridstackContainer = $(".grid-stack"); + var $gridstackContainer = $(`.grid-stack-${this.ks_dashboard_id}`); if($gridstackContainer.length){ this.grid = GridStack.init(this.gridstack_options,$gridstackContainer[0]); var item = self.ksSortItems(self.ks_dashboard_data.ks_item_data) diff --git a/ks_dashboard_ninja/static/src/xml/ks_dashboard_ninja_templates.xml b/ks_dashboard_ninja/static/src/xml/ks_dashboard_ninja_templates.xml index b06b4cc86..e6f5ad444 100644 --- a/ks_dashboard_ninja/static/src/xml/ks_dashboard_ninja_templates.xml +++ b/ks_dashboard_ninja/static/src/xml/ks_dashboard_ninja_templates.xml @@ -398,7 +398,7 @@
-
+
From d169c7f8c90ac9ec23a748bf3282a2cddcee7a82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Sat, 24 May 2025 18:35:42 +0800 Subject: [PATCH 2/3] 1 --- yuthon_notice/__init__.py | 1 - yuthon_notice/__manifest__.py | 1 - yuthon_notice/models/__init__.py | 2 +- yuthon_notice/models/yuthon_cs_tree.py | 9 --------- yuthon_notice/models/yuthon_notice.py | 8 ++++++++ yuthon_notice/security/yuthon_notice_group.xml | 11 ----------- yuthon_notice/views/yuthon_notice_type_views.xml | 1 - 7 files changed, 9 insertions(+), 24 deletions(-) delete mode 100644 yuthon_notice/models/yuthon_cs_tree.py delete mode 100644 yuthon_notice/security/yuthon_notice_group.xml diff --git a/yuthon_notice/__init__.py b/yuthon_notice/__init__.py index cde864bae..a0fdc10fe 100644 --- a/yuthon_notice/__init__.py +++ b/yuthon_notice/__init__.py @@ -1,3 +1,2 @@ # -*- coding: utf-8 -*- - from . import models diff --git a/yuthon_notice/__manifest__.py b/yuthon_notice/__manifest__.py index e2cab36a4..4effe9597 100644 --- a/yuthon_notice/__manifest__.py +++ b/yuthon_notice/__manifest__.py @@ -13,7 +13,6 @@ 'depends': ['base', 'documents', 'soong_workflow', 'yuthon_wechat', 'hr'], 'data': [ 'security/ir.model.access.csv', - 'security/yuthon_notice_group.xml', 'data/notice_code_data.xml', 'data/notice_cron_data.xml', 'data/notice_type_data.xml', diff --git a/yuthon_notice/models/__init__.py b/yuthon_notice/models/__init__.py index c2eda8c8e..b3a43c581 100644 --- a/yuthon_notice/models/__init__.py +++ b/yuthon_notice/models/__init__.py @@ -3,4 +3,4 @@ from . import yuthon_notice from . import yuthon_notice_type from . import yuthon_confirm_users -from . import yuthon_cs_tree + diff --git a/yuthon_notice/models/yuthon_cs_tree.py b/yuthon_notice/models/yuthon_cs_tree.py deleted file mode 100644 index 17cdda562..000000000 --- a/yuthon_notice/models/yuthon_cs_tree.py +++ /dev/null @@ -1,9 +0,0 @@ -from odoo import api, fields, models, tools, _ -from odoo.exceptions import ValidationError, UserError - - -class YuthonCsTree(models.Model): - _name = 'yuthon.cs.tree' - _description = 'Yuthon Customer Service Tree' - - name = fields.Char(string='Name', required=True) \ No newline at end of file diff --git a/yuthon_notice/models/yuthon_notice.py b/yuthon_notice/models/yuthon_notice.py index 02bf39ba7..d2bf0c9a3 100644 --- a/yuthon_notice/models/yuthon_notice.py +++ b/yuthon_notice/models/yuthon_notice.py @@ -5,6 +5,7 @@ import logging _logger = logging.getLogger(__name__) + class YuthonNotice(models.Model): _name = "yuthon.notice" _description = '通知公告' @@ -158,3 +159,10 @@ class YuthonNotice(models.Model): 'notice_state': 'stop', 'end_date': fields.Date.today(), }) + + +class YuthonCsTree(models.Model): + _name = 'yuthon.cs.tree' + _description = 'Yuthon Customer Service Tree' + + name = fields.Char(string='Name', required=True) diff --git a/yuthon_notice/security/yuthon_notice_group.xml b/yuthon_notice/security/yuthon_notice_group.xml deleted file mode 100644 index 6ec98181b..000000000 --- a/yuthon_notice/security/yuthon_notice_group.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - 通知公告组 - - - 通知管理员 - - - - \ No newline at end of file diff --git a/yuthon_notice/views/yuthon_notice_type_views.xml b/yuthon_notice/views/yuthon_notice_type_views.xml index 2aecedb15..4b32bc20f 100644 --- a/yuthon_notice/views/yuthon_notice_type_views.xml +++ b/yuthon_notice/views/yuthon_notice_type_views.xml @@ -22,7 +22,6 @@ id="yuthon_notice_type_setting" parent="yuthon_notice_menu_config_root" name="配置" - groups="group_notice_admin" sequence="7"/> Date: Sat, 24 May 2025 21:46:12 +0800 Subject: [PATCH 3/3] 1 --- soong_workflow/models/soong_workflow_mixin.py | 3 ++- .../templates/soong_workflow_templates.xml | 5 ++--- soong_workflow/wizard/soong_bounced_wizard.py | 3 +-- yuthon_notice/models/yuthon_notice.py | 5 ++--- yuthon_notice/views/yuthon_notice_views.xml | 12 ++++++------ 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py index 107aa1032..fbd7d6349 100644 --- a/soong_workflow/models/soong_workflow_mixin.py +++ b/soong_workflow/models/soong_workflow_mixin.py @@ -869,7 +869,7 @@ class SoongWorkflowMixin(models.AbstractModel): id_el = etree.Element("field") id_el.set("name", "log_ids") id_el.set("invisible", "1") - field_inst.set("readonly", "state in %s and log_ids" % readonly_arr) + field_inst.set("readonly", "state in %s" % readonly_arr) if required_arr: field_inst.set("required", "state in %s" % required_arr) if invisible_arr: @@ -991,6 +991,7 @@ class SoongWorkflowLine(models.Model): "view_mode": "form", } + class ProjectProjectLine(models.Model): _name = "project.project.line" diff --git a/soong_workflow/templates/soong_workflow_templates.xml b/soong_workflow/templates/soong_workflow_templates.xml index b2de86f7c..af88ca38e 100644 --- a/soong_workflow/templates/soong_workflow_templates.xml +++ b/soong_workflow/templates/soong_workflow_templates.xml @@ -28,14 +28,13 @@ - + -
- + - + @@ -110,7 +110,7 @@ js_class="custom_notice_tree_button"> - + @@ -128,10 +128,10 @@
- + - +