Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch feature/workflowgroup of zentao/zentaopms (#10767)

Browse Source
This commit is contained in:
刘刚
2025-08-05 14:19:07 +08:00
committed by Gitfox
parent 6d6bcba2c4 29cdc73995
commit c95503a0c7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/upgrade/model.php
+2 -2
View File
@@ -11235,8 +11235,8 @@ class upgradeModel extends model
->andWhere('lang')->in(array($clientLang, 'all'))
->fetchPairs();
$this->lang->design->typeList = array_merge($this->lang->design->typeList, $typeList);
$this->lang->design->plusTypeList = array_merge($this->lang->design->plusTypeList, $plusTypeList);
if($typeList) $this->lang->design->typeList = $typeList;
if($plusTypeList) $this->lang->design->plusTypeList = $plusTypeList;
$modelList = array('waterfall', 'waterfallplus', 'ipd');
$moduleList = $this->dao->select('t1.id,t1.name,t2.projectModel,t2.id as workflowGroup')->from(TABLE_MODULE)->alias('t1')