diff --git a/module/my/model.php b/module/my/model.php index 2c7bcc3cb2..280f51d2c3 100644 --- a/module/my/model.php +++ b/module/my/model.php @@ -343,20 +343,10 @@ class myModel extends model if($objectType == 'task') { - $projectList = array(); $executionList = array(); - foreach($objectList as $task) - { - $projectList[$task->project] = $task->project; - $executionList[$task->execution] = $task->execution; - } - - $objectPairs = $this->dao->select('id,name')->from(TABLE_PROJECT)->where('id')->in($projectList)->orWhere('id')->in($executionList)->fetchPairs('id'); - foreach($objectList as $task) - { - $task->projectName = zget($objectPairs, $task->project, ''); - $task->executionName = zget($objectPairs, $task->execution, ''); - } + foreach($objectList as $task) $executionList[$task->execution] = $task->execution; + $objectPairs = $this->dao->select('id,name')->from(TABLE_PROJECT)->where('id')->in($executionList)->fetchPairs('id'); + foreach($objectList as $task) $task->executionName = zget($objectPairs, $task->execution, ''); if($objectList) return $this->loadModel('task')->processTasks($objectList); return $objectList; diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php index a9174a1269..849203b8ff 100644 --- a/module/my/view/bug.html.php +++ b/module/my/view/bug.html.php @@ -74,7 +74,7 @@ bug->resolvedByAB);?> bug->resolutionAB);?> - actions;?> + actions;?> story->estimateAB);?> statusAB);?> story->stageAB);?> - actions;?> + actions;?> diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php index 941a6d58fb..d4ec20c9bc 100644 --- a/module/my/view/story.html.php +++ b/module/my/view/story.html.php @@ -67,7 +67,7 @@ story->estimateAB);?> statusAB);?> story->stageAB);?> - actions;?> + actions;?> diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php index 54b0acd24d..b3daa97a7a 100644 --- a/module/my/view/task.html.php +++ b/module/my/view/task.html.php @@ -72,7 +72,7 @@ task->consumedAB);?> task->leftAB);?> statusAB);?> - actions;?> + actions;?> diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php index b371ef8b25..caf1c73096 100644 --- a/module/my/view/testtask.html.php +++ b/module/my/view/testtask.html.php @@ -40,7 +40,7 @@ testtask->begin);?> testtask->end);?> statusAB);?> - actions;?> + actions;?>