From fb5a792fee65a57dea4dde05a7e00c72b0a4ad72 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Thu, 31 Mar 2022 10:05:31 +0800
Subject: [PATCH] * Fix bug #18002.

---
 module/execution/control.php | 4 ----
 module/kanban/model.php      | 1 -
 2 files changed, 5 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 1ba865bf66..6fcab91979 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2158,10 +2158,6 @@ class execution extends control
             unset($this->lang->kanban->type['bug']);
             unset($this->lang->kanban->type['all']);
         }
-        elseif($execution->type == 'stage' and $execution->attribute != 'dev')
-        {
-            unset($this->lang->kanban->type['task']);
-        }
 
         $kanbanGroup = $this->kanban->getExecutionKanban($executionID, $browseType, $groupBy);
         if(empty($kanbanGroup))
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 746b3638ec..949366368b 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -1323,7 +1323,6 @@ class kanbanModel extends model
             ->where('execution')->eq($executionID)
             ->andWhere('deleted')->eq(0)
             ->beginIF($browseType != 'all')->andWhere('type')->eq($browseType)->fi()
-            ->beginIF($execution->type == 'stage' and $execution->attribute != 'dev')->andWhere('type')->ne('task')->fi()
             ->orderBy('order_asc')
             ->fetchAll('id');