From e4a97a5687e421690cf0704be21f1be73d577a72 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Wed, 3 Nov 2021 12:34:03 +0800 Subject: [PATCH] * Fix bug card update logic. --- module/kanban/model.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/kanban/model.php b/module/kanban/model.php index 4e9f3e47f4..d7e96e3868 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -411,6 +411,7 @@ class kanbanModel extends model if($colType == 'unconfirmed' and $bug->status == $status and $bug->confirmed == 0 and strpos($cardPairs['unconfirmed'], ",$bugID,") === false and strpos($cardPairs['fixing'], ",$bugID,") === false) { $cardPairs['unconfirmed'] = empty($cardPairs['unconfirmed']) ? ",$bugID," : ",$bugID" . $cardPairs['unconfirmed']; + if(strpos($cardPairs['closed'], ",$bugID,") !== false) $cardPairs['closed'] = str_replace(",$bugID,", ',', $cardPairs['closed']); } elseif($colType == 'confirmed' and $bug->status == $status and $bug->confirmed == 1 and strpos($cardPairs['confirmed'], ",$bugID,") === false and strpos($cardPairs['fixing'], ",$bugID,") === false) { @@ -421,7 +422,7 @@ class kanbanModel extends model { $cardPairs['fixed'] = empty($cardPairs['fixed']) ? ",$bugID," : ",$bugID" . $cardPairs['fixed']; } - elseif($bug->status == 'closed' and strpos($cardPairs[$colType], ",$bugID,") === false) + elseif($colType == 'closed' and $bug->status == 'closed' and strpos($cardPairs[$colType], ",$bugID,") === false) { $cardPairs[$colType] = empty($cardPairs[$colType]) ? ",$bugID," : ",$bugID". $cardPairs[$colType]; }