* Fix Bug #30240
This commit is contained in:
@@ -1578,6 +1578,8 @@ class executionModel extends model
|
||||
->page($pager)
|
||||
->fetchAll('id');
|
||||
|
||||
if(empty($productID) and !empty($executions)) $projectProductIdList = $this->dao->select('project, product')->from(TABLE_PROJECTPRODUCT)->where('project')->in(array_keys($executions))->fetchPairs();
|
||||
|
||||
$hours = $this->loadModel('project')->computerProgress($executions);
|
||||
$burns = $this->getBurnData($executions);
|
||||
|
||||
@@ -1638,6 +1640,12 @@ class executionModel extends model
|
||||
unset($executions[$key]);
|
||||
}
|
||||
}
|
||||
|
||||
/* Bind execution product */
|
||||
if(!empty($projectProductIdList) and !empty($projectProductIdList[$execution->id]))
|
||||
{
|
||||
$execution->product = $projectProductIdList[$execution->id];
|
||||
}
|
||||
}
|
||||
return array_values($executions);
|
||||
}
|
||||
|
||||
@@ -104,7 +104,8 @@
|
||||
<tbody id="executionTableList">
|
||||
<?php foreach($executionStats as $execution):?>
|
||||
<?php $execution->division = $project->division;?>
|
||||
<?php $this->execution->printNestedList($execution, false, $users, $productID);?>
|
||||
<?php $executionProductID = (empty($productID) and !empty($execution->product)) ? $execution->product : $productID;?>
|
||||
<?php $this->execution->printNestedList($execution, false, $users, $executionProductID);?>
|
||||
<?php endforeach;?>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
Reference in New Issue
Block a user