modify code format
This commit is contained in:
@@ -2118,7 +2118,8 @@ class taskModel extends model
|
||||
if($task->parent > 0) $parents[$task->parent] = $task->parent;
|
||||
}
|
||||
$parents = $this->dao->select('*')->from(TABLE_TASK)->where('id')->in($parents)->fetchAll('id');
|
||||
$lanes = array();
|
||||
|
||||
$lanes = array();
|
||||
$cardsWhere = '';
|
||||
foreach($tasks as $task)
|
||||
{
|
||||
@@ -2134,8 +2135,10 @@ class taskModel extends model
|
||||
$lanes = $this->dao->select('t1.lane,t2.name,t1.cards')
|
||||
->from(TABLE_KANBANCELL)->alias('t1')
|
||||
->leftJoin(TABLE_KANBANLANE)->alias('t2')->on('t1.lane = t2.id')
|
||||
->where('t1.kanban')->eq($executionID)->andWhere($cardsWhere, true)->markRight(1)->fetchAll('cards');
|
||||
|
||||
->where('t1.kanban')->eq($executionID)
|
||||
->andWhere("($cardsWhere)")
|
||||
->fetchAll('cards');
|
||||
|
||||
foreach($tasks as $task)
|
||||
{
|
||||
if($task->parent > 0)
|
||||
@@ -2157,10 +2160,7 @@ class taskModel extends model
|
||||
{
|
||||
foreach($lanes as $lane)
|
||||
{
|
||||
if(strpos($lane->cards, $task->id) !== false)
|
||||
{
|
||||
$task->lane = $lane->name;
|
||||
}
|
||||
if(strpos($lane->cards, $task->id) !== false) $task->lane = $lane->name;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user