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

* Fix bug #28004.

Browse Source
This commit is contained in:
tianshujie
2022-09-27 11:40:19 +08:00
parent 09af08a56e
commit bc3a829601
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/model.php
+6 -6
View File
@@ -1554,7 +1554,7 @@ class kanbanModel extends model
$teamPairs = array();
foreach($taskTeams[$taskID] as $account => $team) $teamPairs[$account] = $team->realname;
$task->team = $teamPairs;
$task->teamMember = $teamPairs;
}
/* Get objects cards menus. */
@@ -1675,9 +1675,9 @@ class kanbanModel extends model
if($groupBy == 'assignedTo')
{
$laneID = (string)$laneID;
if(empty($object->team) and $laneID and $object->$groupBy !== $laneID) continue;
if(empty($object->team) and $laneID === '0' and !empty($object->$groupBy)) continue;
if(!empty($object->team) and !in_array($laneID, array_keys($object->team), true)) continue;
if(empty($object->teamMember) and $laneID and (string)$object->$groupBy !== $laneID) continue;
if(empty($object->teamMember) and $laneID === '0' and !empty($object->$groupBy)) continue;
if(!empty($object->teamMember) and !in_array($laneID, array_keys($object->teamMember), true)) continue;
if($object->$groupBy !== $laneID) $cardData['assignedTo'] = $laneID;
}
@@ -1746,9 +1746,9 @@ class kanbanModel extends model
{
if(!isset($groupByList[$item->$groupBy])) $groupByList[$item->$groupBy] = $item->$groupBy;
if($groupBy == 'assignedTo' and !empty($item->team))
if($groupBy == 'assignedTo' and !empty($item->teamMember))
{
foreach($item->team as $account => $name)
foreach($item->teamMember as $account => $name)
{
if(!isset($groupByList[$account])) $groupByList[$account] = $account;
}