From 182b8217f3075ac3a46b77bd1ccdce09405875ba Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Wed, 14 Jul 2021 13:42:30 +0800
Subject: [PATCH] finish task #40111

---
 module/execution/control.php | 2 +-
 module/project/control.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 1afaef1b7b..c0c2c88a81 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1329,7 +1329,7 @@ class execution extends control
         $this->view->position[]      = $this->view->title;
         $this->view->executions      = array('' => '') + $this->execution->getList($projectID);
         $this->view->groups          = $this->loadModel('group')->getPairs();
-        $this->view->allProducts     = array(0 => '') + $this->loadModel('product')->getProductPairsByProject($projectID);
+        $this->view->allProducts     = array(0 => '') + $this->loadModel('product')->getProductPairsByProject($projectID, 'noclosed');
         $this->view->acl             = $acl;
         $this->view->plan            = $plan;
         $this->view->name            = $name;
diff --git a/module/project/control.php b/module/project/control.php
index c639385e1c..9b0badd995 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -366,7 +366,7 @@ class project extends control
         $this->view->users           = $this->user->getPairs('noclosed|nodeleted');
         $this->view->copyProjects    = $this->project->getPairsByModel();
         $this->view->products        = $products;
-        $this->view->allProducts     = array('0' => '') + $this->program->getProductPairs($programID);
+        $this->view->allProducts     = array('0' => '') + $this->program->getProductPairs($programID, 'assign', 'noclosed');
         $this->view->productPlans    = array('0' => '') + $productPlans;
         $this->view->branchGroups    = $this->loadModel('branch')->getByProducts(array_keys($products));
         $this->view->programID       = $programID;