From b11ebb62b79687abfc3df4f4a4489085373bf203 Mon Sep 17 00:00:00 2001 From: sunguangming Date: Wed, 4 Jun 2025 00:41:53 +0000 Subject: [PATCH 1/2] * [bug#62953,done,0.2h] fix bug. --- module/doc/zen.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/module/doc/zen.php b/module/doc/zen.php index 116e33def3..0270baf6c7 100644 --- a/module/doc/zen.php +++ b/module/doc/zen.php @@ -447,7 +447,9 @@ class docZen extends doc */ protected function setObjectsForCreate(string $linkType, object|null $lib, string $unclosed, int $objectID): void { - $objects = array(); + dao::$filterTpl = 'skip'; + + $objects = array(); if($linkType == 'project') { $objects = $this->project->getPairsByProgram(0, 'all', false, 'order_asc'); From e9bbfb70ad6847f877bb6329e4247f81480f4eb1 Mon Sep 17 00:00:00 2001 From: sunguangming Date: Wed, 4 Jun 2025 01:39:15 +0000 Subject: [PATCH 2/2] * [bug#62954,done,0.2h] remove menu in tpl. --- module/doc/zen.php | 6 +++++- module/execution/model.php | 2 ++ module/execution/ui/view.html.php | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/module/doc/zen.php b/module/doc/zen.php index 0270baf6c7..f1f3e4c383 100644 --- a/module/doc/zen.php +++ b/module/doc/zen.php @@ -447,7 +447,11 @@ class docZen extends doc */ protected function setObjectsForCreate(string $linkType, object|null $lib, string $unclosed, int $objectID): void { - dao::$filterTpl = 'skip'; + if(!empty($objectID)) + { + $object = $this->loadModel('project')->fetchByID((int)$objectID); + if(!empty($object->isTpl)) dao::$filterTpl = 'skip'; + } $objects = array(); if($linkType == 'project') diff --git a/module/execution/model.php b/module/execution/model.php index b006980ca4..092cba2e31 100755 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -186,6 +186,8 @@ class executionModel extends model } unset($this->lang->execution->menu->other); + if(isset($this->lang->execution->menu->settings['subMenu']->products)) unset($this->lang->execution->menu->settings['subMenu']->products); // 模板下隐藏产品 + if(isset($this->lang->execution->menu->settings['subMenu']->whitelist)) unset($this->lang->execution->menu->settings['subMenu']->whitelist); // 模板下隐藏白名单 } } diff --git a/module/execution/ui/view.html.php b/module/execution/ui/view.html.php index 22d9e7e95d..16b05612fa 100644 --- a/module/execution/ui/view.html.php +++ b/module/execution/ui/view.html.php @@ -451,6 +451,7 @@ div (!empty($execution->projectInfo->hasProduct) || $features['plan']) ? h::table ( setClass('table condensed bordered'), + setID('products'), h::thead ( h::tr