Merge branch ztflow-sunguangming-dev/task-144291#sunguangming of zentao/zentaopms (#9095)
This commit is contained in:
+7
-1
@@ -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');
|
||||
|
||||
@@ -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); // 模板下隐藏白名单
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -451,6 +451,7 @@ div
|
||||
(!empty($execution->projectInfo->hasProduct) || $features['plan']) ? h::table
|
||||
(
|
||||
setClass('table condensed bordered'),
|
||||
setID('products'),
|
||||
h::thead
|
||||
(
|
||||
h::tr
|
||||
|
||||
Reference in New Issue
Block a user