diff --git a/extension/lite/product/ext/control/browse.php b/extension/lite/product/ext/control/browse.php index 642501c6d7..b1e665c622 100644 --- a/extension/lite/product/ext/control/browse.php +++ b/extension/lite/product/ext/control/browse.php @@ -9,7 +9,7 @@ class product extends control $this->loadModel('user'); $projectProducts = $this->loadModel('product')->getProducts($projectID); - $productPlans = $this->execution->getPlans($projectProducts); + $productPlans = $this->execution->getPlans(array_keys($projectProducts)); $this->products = array(); foreach($projectProducts as $productID => $product) $this->products[$productID] = $product->name; diff --git a/module/execution/control.php b/module/execution/control.php index 53289fed10..5ff5da8708 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -796,7 +796,7 @@ class execution extends control $storyBugs = $this->loadModel('bug')->getStoryBugCounts($storyIdList, $executionID); $storyCases = $this->loadModel('testcase')->getStoryCaseCounts($storyIdList); - $plans = $this->execution->getPlans($products, 'skipParent|withMainPlan|unexpired|noclosed|sortedByDate', $executionID); + $plans = $this->execution->getPlans(array_keys($products), 'skipParent|withMainPlan|unexpired|noclosed|sortedByDate', $executionID); $allPlans = array(); if(!empty($plans)) { diff --git a/module/execution/model.php b/module/execution/model.php index 4cff8d44ef..0fd42c76be 100755 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -4957,7 +4957,7 @@ class executionModel extends model * Get plan data from the ID list of the product. * * @param array $productID - * @param string $param withMainPlan|skipParent|unexpired|noclosed + * @param string $param withMainPlan|skipParent|unexpired|noclosed|sortedByDate * @param int $executionID * @return array */ diff --git a/module/execution/zen.php b/module/execution/zen.php index ee6fb731ea..a2a02b3fe4 100644 --- a/module/execution/zen.php +++ b/module/execution/zen.php @@ -49,7 +49,7 @@ class executionZen extends execution foreach($products as $product) $productNames[$product->id] = $product->name; /* Get execution linked plans. */ - $plans = $this->execution->getPlans($products, 'skipParent', $executionID); + $plans = $this->execution->getPlans(array_keys($products), 'skipParent', $executionID); $allPlans = array(); if(!empty($plans)) { @@ -149,7 +149,7 @@ class executionZen extends execution if($products) $productID = key($products); foreach($products as $product) $productNames[$product->id] = $product->name; - $plans = $this->execution->getPlans($products); + $plans = $this->execution->getPlans(array_keys($products)); $allPlans = array(); if(!empty($plans)) { @@ -210,7 +210,7 @@ class executionZen extends execution $this->view->userList = $userList; $this->view->products = $products; $this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products), '', $linkedBranches); - $this->view->planGroups = $this->execution->getPlans($products); + $this->view->planGroups = $this->execution->getPlans(array_keys($products)); $this->view->actions = $this->loadModel('action')->getList('execution', $executionID); $this->view->dynamics = $this->loadModel('action')->getDynamic('all', 'all', 'date_desc', $pager, 'all', 'all', $executionID); $this->view->teamMembers = $this->execution->getTeamMembers($executionID); diff --git a/module/product/zen.php b/module/product/zen.php index 6dd29ccecf..e5a6620c46 100644 --- a/module/product/zen.php +++ b/module/product/zen.php @@ -931,7 +931,7 @@ class productZen extends product */ protected function getProductPlans(array $projectProducts, int $projectID, string $storyType, bool $isProjectStory): array { - if($isProjectStory && $storyType == 'story') return $this->loadModel('execution')->getPlans($projectProducts, 'skipParent,unexpired,noclosed', $projectID); + if($isProjectStory && $storyType == 'story') return $this->loadModel('execution')->getPlans(array_keys($projectProducts), 'skipParent,unexpired,noclosed', $projectID); return array(); } diff --git a/module/project/control.php b/module/project/control.php index c6ee0fdca5..98a9f7b22c 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -594,7 +594,7 @@ class project extends control $this->view->teamMembers = $this->project->getTeamMembers($projectID); $this->view->statData = $this->project->getStatData($projectID); $this->view->workhour = $this->project->getWorkhour($projectID); - $this->view->planGroup = $this->loadModel('execution')->getPlans($products); + $this->view->planGroup = $this->loadModel('execution')->getPlans(array_keys($products)); $this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products), '', $linkedBranches); $this->view->dynamics = $this->loadModel('action')->getDynamic('all', 'all', 'date_desc', $pager, 'all', $projectID); $this->view->programList = $this->loadModel('program')->getPairsByList($project->path);