From 0d4b77197fa6eb76b5ce31d9e648379c5e2120d8 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Mon, 29 Aug 2022 14:49:33 +0800
Subject: [PATCH] * Fix bug #26936.

---
 module/program/model.php                  | 2 +-
 module/project/view/browsebylist.html.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/program/model.php b/module/program/model.php
index c9a9caf99b..1b50a9d93d 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -575,7 +575,7 @@ class programModel extends model
             ->beginIF($this->config->systemMode == 'new')->andWhere('t1.type')->eq('project')->fi()
             ->beginIF($this->config->systemMode == 'new' and ($this->cookie->involved or $involved))->andWhere('t2.type')->eq('project')->fi()
             ->beginIF(!in_array($browseType, array('all', 'undone', 'bysearch', 'review', 'unclosed'), true))->andWhere('t1.status')->eq($browseType)->fi()
-            ->beginIF($browseType == 'undone' or $browseType = 'unclosed')->andWhere('t1.status')->in('wait,doing')->fi()
+            ->beginIF($browseType == 'undone' or $browseType == 'unclosed')->andWhere('t1.status')->in('wait,doing')->fi()
             ->beginIF($browseType == 'review')
             ->andWhere("FIND_IN_SET('{$this->app->user->account}', t1.reviewers)")
             ->andWhere('t1.reviewStatus')->eq('doing')
diff --git a/module/project/view/browsebylist.html.php b/module/project/view/browsebylist.html.php
index 61d7450523..588ce47f0a 100644
--- a/module/project/view/browsebylist.html.php
+++ b/module/project/view/browsebylist.html.php
@@ -105,7 +105,7 @@
             <?php
             foreach($setting as $value)
             {
-              if($value->id == 'status' and $browseType !== 'all') $value->show = false;
+              if($value->id == 'status' and strpos(',all,bysearch,', ",$browseType,") === false) $value->show = false;
               if($value->id == 'teamCount' and $browseType == 'all') $value->show = false;
               if(commonModel::isTutorialMode() && ($value->id == 'PM' || $value->id == 'budget' || $value->id == 'teamCount')) $value->show = false;
               if($value->show) $this->datatable->printHead($value, $orderBy, $vars, $canBatchEdit);