From 0b9e65b245e4968ef66966332a8fae9ec22f296f Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Wed, 26 Jan 2022 10:27:50 +0800
Subject: [PATCH] * Fix bug#18983.

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

diff --git a/module/kanban/control.php b/module/kanban/control.php
index f3393f6257..a464d86b1e 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -1147,7 +1147,7 @@ class kanban extends control
         }
         else
         {
-            $projects        += $this->loadModel('project')->getPairsByProgram();
+            $projects        += $this->loadModel('project')->getPairsByProgram('', 'all', false, 'order_asc', 'kanban');
             $builds2Imported  = $this->build->getProjectBuilds($selectedProjectID, 'all', 0, 't1.date_desc,t1.id_desc', $pager);
         }
 
diff --git a/module/project/model.php b/module/project/model.php
index dab7ab3575..aad29cda09 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -480,10 +480,11 @@ class projectModel extends model
      * @param  status $status    all|wait|doing|suspended|closed|noclosed
      * @param  bool   $isQueryAll
      * @param  string $orderBy
+     * @param  string $excludedModel
      * @access public
      * @return object
      */
-    public function getPairsByProgram($programID = '', $status = 'all', $isQueryAll = false, $orderBy = 'order_asc')
+    public function getPairsByProgram($programID = '', $status = 'all', $isQueryAll = false, $orderBy = 'order_asc', $excludedModel = '')
     {
         if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getProjectPairs();
         return $this->dao->select('id, name')->from(TABLE_PROJECT)
@@ -491,6 +492,7 @@ class projectModel extends model
             ->andWhere('deleted')->eq(0)
             ->beginIF($programID !== '')->andWhere('parent')->eq($programID)->fi()
             ->beginIF($status != 'all' && $status != 'noclosed')->andWhere('status')->eq($status)->fi()
+            ->beginIF($excludedModel)->andWhere('model')->ne($excludedModel)->fi()
             ->beginIF($status == 'noclosed')->andWhere('status')->ne('closed')->fi()
             ->beginIF(!$this->app->user->admin and !$isQueryAll)->andWhere('id')->in($this->app->user->view->projects)->fi()
             ->orderBy($orderBy)