diff --git a/module/execution/model.php b/module/execution/model.php index 175741a1cc..b594e4bd77 100755 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -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])) { diff --git a/module/project/model.php b/module/project/model.php index 78a943fbe9..fcc2dd8ccf 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -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();