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

* Finish task #85434.

Browse Source
This commit is contained in:
liumengyi
2023-02-23 02:11:30 +00:00
parent 0d0d6c15c1
commit 9283507b20
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+7 -2
View File
@@ -450,7 +450,7 @@ class executionModel extends model
->checkIF($sprint->end != '', 'end', 'ge', $sprint->begin)
->checkFlow()
->exec();
/* Add the creater to the team. */
if(!dao::isError())
{
@@ -1993,10 +1993,15 @@ class executionModel extends model
if($execution->parent) $parentList[$execution->parent] = $execution->parent;
if($execution->projectName) $execution->name = $execution->projectName . ' / ' . $execution->name;
}
elseif($param === 'hasParentName')
elseif(strpos($param, 'hasParentName') !== false)
{
$parentExecutions = $this->dao->select('id,name')->from(TABLE_EXECUTION)->where('id')->in(trim($execution->path, ','))->andWhere('type')->in('stage,kanban,sprint')->orderBy('grade')->fetchPairs();
$executions[$execution->id]->title = implode('/', $parentExecutions);
if(strpos($param, 'skipParent') !== false)
{
$children = $this->getChildExecutions($execution->id);
if(count($children) > 0) $parentList[$execution->id] = $execution->id;
}
}
elseif(isset($executions[$execution->parent]))
{
module/project/model.php
+1 -1
View File
@@ -2624,7 +2624,7 @@ class projectModel extends model
$this->loadModel('program');
$projects = $this->program->getProjectStats(0, 'all', 0, 'order_asc');
$executions = $this->loadModel('execution')->getStatData(0, 'doing');
$executions = $this->loadModel('execution')->getStatData(0, 'doing', 0, 0, false, 'hasParentName|skipParent');
$doingExecutions = array();
$latestExecutions = array();