* Fix Bug #30240

2022-11-25 09:34:57 +08:00
parent 4223c7a7f1
commit 3e2648ab5e
2 changed files with 10 additions and 1 deletions
@@ -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);
    }