diff --git a/module/doc/zen.php b/module/doc/zen.php index 116e33def3..f1f3e4c383 100644 --- a/module/doc/zen.php +++ b/module/doc/zen.php @@ -447,7 +447,13 @@ class docZen extends doc */ protected function setObjectsForCreate(string $linkType, object|null $lib, string $unclosed, int $objectID): void { - $objects = array(); + if(!empty($objectID)) + { + $object = $this->loadModel('project')->fetchByID((int)$objectID); + if(!empty($object->isTpl)) dao::$filterTpl = 'skip'; + } + + $objects = array(); if($linkType == 'project') { $objects = $this->project->getPairsByProgram(0, 'all', false, 'order_asc'); 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