* Finish task #85434.
This commit is contained in:
@@ -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]))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user