From 02ef32158f90a55c06b7d47268f45816cd10a035 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 15 Mar 2022 15:28:27 +0800 Subject: [PATCH 1/3] * Fix bug #19243. --- module/kanban/model.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/kanban/model.php b/module/kanban/model.php index 2175a4abaa..af001af1f6 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -2872,6 +2872,7 @@ class kanbanModel extends model ->where('t1.kanban')->eq($kanban->id) ->andWhere('t1.deleted')->eq(0) ->andWhere('t2.deleted')->eq(0) + ->andWhere('t2.type')->eq('common') ->fetch('count'); if($laneCount > 1) $printSetHeightBtn = true; From 3b6637b9dbf404066b3acc50c3654d06f82c0780 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 15 Mar 2022 16:18:46 +0800 Subject: [PATCH 2/3] * Fix bug #19243. --- module/kanban/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/kanban/model.php b/module/kanban/model.php index af001af1f6..0641c09b63 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -93,7 +93,7 @@ class kanbanModel extends model $region->order = $order; $this->dao->insert(TABLE_KANBANREGION)->data($region) ->batchCheck($this->config->kanban->require->createregion, 'notempty') - ->check('name', 'unique', "kanban = {$kanban->id} AND deleted = '0'") + ->check('name', 'unique', "kanban = {$kanban->id} AND deleted = '0' AND space='$region->space'") ->autoCheck() ->exec(); From a9df580dec1ab785b441eabe8752aa8e7431ca46 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 15 Mar 2022 16:22:25 +0800 Subject: [PATCH 3/3] * Fix bug #19243. --- module/kanban/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/kanban/model.php b/module/kanban/model.php index 0641c09b63..f05bb3855a 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -87,7 +87,7 @@ class kanbanModel extends model ->add('createdDate', helper::now()) ->trim('name') ->get(); - if($from == 'kanban') $region->space = $kanban->space; + $region->space = $from == 'kanban' ? $kanban->space : 0; } $region->order = $order;