diff --git a/module/execution/control.php b/module/execution/control.php index 646639a142..c8584ade12 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -208,7 +208,7 @@ class execution extends control $branchGroups = $this->loadModel('branch')->getByProducts(array_keys($this->view->products)); if($branchGroups) { - foreach($tasks as $id => $task) + foreach($tasks as $task) { if(!empty($task->product) and isset($branchGroups[$task->product][$task->branch])) $task->branch = $branchGroups[$task->product][$task->branch]; } diff --git a/module/execution/model.php b/module/execution/model.php index 44a013d784..3c0b1e48c2 100755 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -1863,15 +1863,6 @@ class executionModel extends model $executionQuery = preg_replace('/(`\w*`)/', 't1.$1',$executionQuery); } - /* Get involved executions. */ - if($browseType == 'involved') - { - $myExecutionIDList = $this->dao->select('root')->from(TABLE_TEAM) - ->where('account')->eq($this->app->user->account) - ->andWhere('type')->eq('execution') - ->fetchPairs(); - } - $executions = $this->dao->select('t1.*,t2.name projectName, t2.model as projectModel')->from(TABLE_EXECUTION)->alias('t1') ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id') ->beginIF($productID)->leftJoin(TABLE_PROJECTPRODUCT)->alias('t3')->on('t1.id=t3.project')->fi() @@ -2462,7 +2453,7 @@ class executionModel extends model ->fetchGroup('execution', 'id'); $taskIdList = array(); - foreach($executionTasks as $executionID => $tasks) $taskIdList = array_merge($taskIdList, array_keys($tasks)); + foreach($executionTasks as $tasks) $taskIdList = array_merge($taskIdList, array_keys($tasks)); $taskIdList = array_unique($taskIdList); $teamGroups = $this->dao->select('id,task,account,status')->from(TABLE_TASKTEAM)->where('task')->in($taskIdList)->fetchGroup('task', 'id'); @@ -5409,7 +5400,6 @@ class executionModel extends model $rows = array(); foreach($executions as $execution) { - $link = $execution->type == 'kanban' ? helper::createLink('execution', 'kanban', "id=$execution->id") : helper::createLink('execution', 'task', "id=$execution->id"); $execution->rawID = $execution->id; $execution->isExecution = 1; $execution->id = 'pid' . (string)$execution->id;