Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix kanban code error.

Browse Source
This commit is contained in:
sunguangming
2023-11-17 08:53:06 +08:00
parent d2f8759ca6
commit 8d208d03ce
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/kanban/ext/model/lite.php
+2 -2
View File
@@ -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;
module/kanban/model.php
+3 -3
View File
@@ -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;
}