From eb8f8bac5ea91bc97d3f8c654ddd9b2fbdfcdded Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Wed, 16 Nov 2022 05:29:40 +0000
Subject: [PATCH] * Fix bug #29692.

---
 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 4bc1ba9ad3..ede68f3a7a 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -685,7 +685,7 @@ class execution extends control
         unset($this->config->bug->search['fields']['resolvedDate']);
         unset($this->config->bug->search['fields']['closedDate']);
         unset($this->config->bug->search['fields']['branch']);
-        if(empty($execution->multiple) && empty($execution->hasProduct)) unset($this->config->bug->search['fields']['plan']);
+        if(empty($execution->multiple) and empty($execution->hasProduct)) unset($this->config->bug->search['fields']['plan']);
         if(empty($project->hasProduct))
         {
             unset($this->config->bug->search['fields']['product']);
diff --git a/module/project/control.php b/module/project/control.php
index 3f5574ef39..ca5bebc660 100755
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1174,12 +1174,12 @@ class project extends control
         $products = $this->product->getProducts($projectID);
 
         if(!$project->multiple) unset($this->config->bug->datatable->fieldList['execution']);
-
         if(!$project->hasProduct)
         {
             unset($this->config->bug->search['fields']['product']);
             if($project->model != 'scrum') unset($this->config->bug->search['fields']['plan']);
         }
+        if(!$project->multiple and !$project->hasProduct) unset($this->config->bug->search['fields']['plan']);
 
         $productPairs = array('0' => $this->lang->product->all);
         foreach($products as $productData) $productPairs[$productData->id] = $productData->name;