diff --git a/module/execution/control.php b/module/execution/control.php index e12748522b..c977fea306 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -2086,11 +2086,11 @@ class execution extends control $this->view->productNum = count($products); $this->view->branchID = $branchID; $this->view->projectID = $this->loadModel('task')->getProjectID($execution->id); - $this->view->allProducts = $this->product->getProductPairsByProject($this->view->projectID, 'noclosed'); $this->view->allPlans = $allPlans; $this->view->kanbanData = $kanbanData; $this->view->executionActions = $executionActions; $this->view->kanban = $this->lang->execution->kanban; + $this->view->linkedProducts = $this->product->getProducts($executionID); $this->display(); } diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php index c87a8ccfa6..36e95e12c1 100644 --- a/module/execution/view/kanban.html.php +++ b/module/execution/view/kanban.html.php @@ -49,7 +49,7 @@ js::set('colorListLang', $lang->kanbancard->colorList); js::set('colorList', $this->config->kanban->cardColorList); js::set('projectID', $projectID); js::set('vision', $this->config->vision); -js::set('productCount', count($allProducts)); +js::set('productCount', count($productNames)); js::set('executionID', $execution->id); $canSortRegion = commonModel::hasPriv('kanban', 'sortRegion') && count($regions) > 1; @@ -169,7 +169,7 @@ js::set('hasTaskButton', $hasTaskButton); 1) + if(count($productNames) > 1) { echo '