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

Merge branch release/22.0.beta of zentao/zentaopms (#13323)

Browse Source
This commit is contained in:
刘刚
2026-01-15 17:19:08 +08:00
committed by Gitfox
parent a1e55f339f 05679284eb
commit 9be7f9d706
6 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/ui/browsebylist.html.php
+6
View File
@@ -105,6 +105,12 @@ foreach($settings as $key => $value)
if(commonModel::isTutorialMode() && in_array($value['name'], array('PM', 'budget', 'teamCount'))) unset($settings[$key]);
}
$tableData = initTableData($projectStats, $settings, $this->project);
$tableData = array_map(function($item)
{
if(!$item->workflowGroup) $item->workflowGroup = '';
return $item;
}, $tableData);
/* zin: Define the dtable in main content. */
dtable
(
module/release/model.php
+2 -2
View File
@@ -118,7 +118,7 @@ class releaseModel extends model
$builds = $this->dao->select("t1.id, t1.name, t1.branch, t1.project, t1.execution, IF(t2.name IS NOT NULL, t2.name, '') AS projectName")
->from(TABLE_BUILD)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
->where("product")->in($productIdList)
->where("t1.product")->in($productIdList)
->fetchAll('id');
if(!empty($builds))
{
@@ -199,7 +199,7 @@ class releaseModel extends model
$builds = $this->dao->select("t1.id, t1.name, t1.branch, t1.project, t1.execution, IF(t2.name IS NOT NULL, t2.name, '') AS projectName")
->from(TABLE_BUILD)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
->where("product")->eq($productID)
->where("t1.product")->eq($productID)
->fetchAll('id');
if(!empty($builds))
{
module/testcase/config/table.php
+1 -2
View File
@@ -84,10 +84,9 @@ $config->testcase->dtable->fieldList['openedDate']['group'] = 4;
$config->testcase->dtable->fieldList['openedDate']['sortType'] = true;
$config->testcase->dtable->fieldList['reviewedBy']['title'] = $lang->testcase->reviewedByAB;
$config->testcase->dtable->fieldList['reviewedBy']['type'] = 'user';
$config->testcase->dtable->fieldList['reviewedBy']['type'] = 'text';
$config->testcase->dtable->fieldList['reviewedBy']['group'] = 4;
$config->testcase->dtable->fieldList['reviewedBy']['sortType'] = true;
$config->testcase->dtable->fieldList['reviewedBy']['delimiter'] = true;
$config->testcase->dtable->fieldList['reviewedDate']['title'] = $lang->testcase->reviewedDate;
$config->testcase->dtable->fieldList['reviewedDate']['type'] = 'date';
module/testcase/ui/browse.html.php
+4 -1
View File
@@ -137,10 +137,13 @@ foreach($cases as $case)
if(!empty($case->needconfirm)) $case->status = 'changed';
if(isset($case->script)) unset($case->script);
$stages = array();
$stages = array();
$reviewedByList = array();
foreach(explode(',', $case->stage) as $stage) $stages[] = zget($lang->testcase->stageList, $stage, '');
foreach(explode(',', $case->reviewedBy) as $reviewedBy) $reviewedByList[] = zget($users, $reviewedBy, '');
$case->stage = implode(',', array_filter($stages));
$case->reviewedBy = implode(',', array_filter($reviewedByList));
$case->browseType = $browseType;
initTableData(array($case), $cols, $this->testcase);
if(!$canModify) unset($case->actions);
module/upgrade/config.php
+4 -2
View File
@@ -75,7 +75,8 @@ $config->upgrade->maxVersion['max7_3'] = '21_7_4';
$config->upgrade->maxVersion['max7_4'] = '21_7_5';
$config->upgrade->maxVersion['max7_5'] = '21_7_6';
$config->upgrade->maxVersion['max7_6'] = '21_7_7';
$config->upgrade->maxVersion['max7_7'] = '21_7_8'; // max insert position.
$config->upgrade->maxVersion['max7_7'] = '21_7_8';
$config->upgrade->maxVersion['max8_0_beta'] = '22_0_beta'; // max insert position.
$config->upgrade->bizVersion = array();
$config->upgrade->bizVersion['biz1_0'] = '9_5_1';
@@ -189,7 +190,8 @@ $config->upgrade->bizVersion['biz12_3'] = '21_7_4';
$config->upgrade->bizVersion['biz12_4'] = '21_7_5';
$config->upgrade->bizVersion['biz12_5'] = '21_7_6';
$config->upgrade->bizVersion['biz12_6'] = '21_7_7';
$config->upgrade->bizVersion['biz12_7'] = '21_7_8'; // biz insert position.
$config->upgrade->bizVersion['biz12_7'] = '21_7_8';
$config->upgrade->bizVersion['biz13_0_beta'] = '22_0_beta'; // biz insert position.
$config->upgrade->proVersion = array();
$config->upgrade->proVersion['pro1_0'] = '3_1';
module/upgrade/zen.php
+1 -1
View File
@@ -232,7 +232,7 @@ class upgradeZen extends upgrade
if($version == 'pro1_1_1')
{
$sqlFile = $this->ugprade->getUpgradeFile('pro1.1');
$sqlFile = $this->upgrade->getUpgradeFile('pro1.1');
$sqlChanges = $this->getChangesBySql($version, $sqlFile);
$changes = array_merge($changes, $sqlChanges);
}