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

- Remove unused variable.

Browse Source
This commit is contained in:
tianshujie
2023-07-08 10:54:10 +08:00
parent 411b15813b
commit 962ee3cfb5
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+1 -1
View File
@@ -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];
}
module/execution/model.php
+1 -11
View File
@@ -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;