From 8d208d03ce43940dcdbfc7acad03899facb056be Mon Sep 17 00:00:00 2001 From: sunguangming Date: Fri, 17 Nov 2023 08:53:06 +0800 Subject: [PATCH] * Fix kanban code error. --- extension/lite/kanban/ext/model/lite.php | 4 ++-- module/kanban/model.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extension/lite/kanban/ext/model/lite.php b/extension/lite/kanban/ext/model/lite.php index b613c2430f..a8522d3c03 100644 --- a/extension/lite/kanban/ext/model/lite.php +++ b/extension/lite/kanban/ext/model/lite.php @@ -133,8 +133,8 @@ public function getKanban4Group($executionID, $browseType, $groupBy, $searchValu $cardData = array(); - if(in_array($groupBy, array('module', 'story', 'pri', 'severity')) and (int)$object->$groupBy !== $laneID) continue; - if(in_array($groupBy, array('assignedTo', 'type', 'category', 'source')) and $object->$groupBy !== $laneID) continue; + if(in_array($groupBy, array('module', 'story', 'pri', 'severity')) and $object->$groupBy != $laneID) continue; + if(in_array($groupBy, array('assignedTo', 'type', 'category', 'source')) and $object->$groupBy != $laneID) continue; $cardData['id'] = $object->id; $cardData['order'] = $cardOrder; diff --git a/module/kanban/model.php b/module/kanban/model.php index 5035f028c4..9f91d93151 100755 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -1961,13 +1961,13 @@ class kanbanModel extends model $object = zget($objects, $cardID, array()); if(empty($object)) continue; - if(in_array($groupBy, array('module', 'story', 'pri', 'severity')) and (int)$object->$groupBy !== $laneID) continue; - if(in_array($groupBy, array('type', 'category', 'source')) and $object->$groupBy !== $laneID) continue; + if(in_array($groupBy, array('module', 'story', 'pri', 'severity')) and $object->$groupBy != $laneID) continue; + if(in_array($groupBy, array('type', 'category', 'source')) and $object->$groupBy != $laneID) continue; if($groupBy == 'assignedTo') { $laneID = (string)$laneID; if(empty($object->$groupBy)) $object->$groupBy = ''; - if(empty($object->teamMember) and (string)$object->$groupBy !== $laneID) continue; + if(empty($object->teamMember) and $object->$groupBy != $laneID) continue; if(!empty($object->teamMember) and !in_array($laneID, array_keys($object->teamMember), true)) continue; }