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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
王怡栋
2022-11-25 15:56:16 +08:00
parent a14dc11193 593c7d41b2
commit 46d98dcada
3 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
-10
View File
@@ -3867,22 +3867,12 @@ class execution extends control
$executionStats = $this->execution->getStatData(0, $status, $productID, 0, false, $queryID, $orderBy, $pager);
$parentIdList = array();
foreach($executionStats as $execution)
{
if($execution->type != 'stage') continue;
if($execution->grade == 2 and $execution->project != $execution->parent) $parentIdList[$execution->parent] = $execution->parent;
}
$parents = array();
if($parentIdList) $parents = $this->execution->getByIdList($parentIdList);
$allExecutionsNum = $this->execution->getStatData(0, 'all');
$this->view->allExecutionsNum = count($allExecutionsNum);
$this->view->executionStats = $executionStats;
$this->view->productList = $this->loadModel('product')->getProductPairsByProject(0);
$this->view->productID = $productID;
$this->view->parents = $parents;
$this->view->pager = $pager;
$this->view->orderBy = $orderBy;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
module/project/control.php
+1 -2
View File
@@ -2241,8 +2241,7 @@ class project extends control
$branchGroups = $this->loadModel('branch')->getByProducts(array_keys($allProducts), 'ignoreNormal|noclosed');
if($this->config->systemMode == 'ALM')
{
$paths = explode(',', trim($project->path, ','));
$topProgramID = count($paths) > 1 ? $this->program->getTopByPath($project->path) : 0;
$topProgramID = $project->parent ? $this->program->getTopByPath($project->path) : 0;
$productsGroupByProgram = $this->product->getProductsGroupByProgram();
$currentProducts = array();
module/upgrade/control.php
+3 -10
View File
@@ -187,12 +187,12 @@ class upgrade extends control
$selectMode = false;
}
if(version_compare($openVersion, '15_0', '>=') and $systemMode == 'new')
if(version_compare($openVersion, '15_0_rc1', '>=') and $systemMode == 'new')
{
$this->loadModel('setting')->setItem('system.common.global.mode', 'ALM');
$selectMode = false;
}
if(version_compare($openVersion, '18_0', '>=')) $selectMode = false;
if(version_compare($openVersion, '18_0_beta1', '>=')) $selectMode = false;
if($selectMode) $this->locate(inlink('to18Guide', "fromVersion=$fromVersion"));
@@ -241,16 +241,9 @@ class upgrade extends control
/* Set default program for product and project with no program. */
$this->upgrade->relateDefaultProgram($programID);
if(version_compare($openVersion, '15_0', '<')) $this->locate(inlink('selectMergeMode', "fromVersion=$fromVersion&mode=light"));
$this->locate(inlink('afterExec', "fromVersion=$fromVersion"));
}
if($mode == 'ALM')
{
if(version_compare($openVersion, '15_0', '<')) $this->locate(inlink('selectMergeMode', "fromVersion=$fromVersion&mode=ALM"));
$this->locate(inlink('afterExec', "fromVersion=$fromVersion"));
}
$this->locate(inlink('selectMergeMode', "fromVersion=$fromVersion&mode=$mode"));
}
list($disabledFeatures, $enabledScrumFeatures, $disabledScrumFeatures) = $this->loadModel('custom')->computeFeatures();