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

* Fix bug #3257.

Browse Source
This commit is contained in:
chenfei
2020-07-08 15:35:55 +08:00
parent 4962154b82
commit 53cc2178cf
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
+22 -4
View File
@@ -2498,8 +2498,15 @@ class projectModel extends model
$status = $task->status;
if(!empty($groupKey) and (($type == 'story' and isset($stories[$groupKey])) or $type != 'story'))
{
if(!isset($kanbanGroup[$groupKey])) $kanbanGroup[$groupKey] = new stdclass();
$kanbanGroup[$groupKey]->tasks[$status][] = $task;
if($type == 'assignedTo' and $groupKey == 'closed')
{
$closedTasks[$groupKey][] = $task;
}
else
{
if(!isset($kanbanGroup[$groupKey])) $kanbanGroup[$groupKey] = new stdclass();
$kanbanGroup[$groupKey]->tasks[$status][] = $task;
}
}
else
{
@@ -2515,8 +2522,15 @@ class projectModel extends model
$status = $status == 'active' ? 'wait' : ($status == 'resolved' ? ($bug->resolution == 'postponed' ? 'cancel' : 'done') : $status);
if(!empty($groupKey) and (($type == 'story' and isset($stories[$groupKey])) or $type != 'story'))
{
if(!isset($kanbanGroup[$groupKey])) $kanbanGroup[$groupKey] = new stdclass();
$kanbanGroup[$groupKey]->bugs[$status][] = $bug;
if($type == 'assignedTo' and $groupKey == 'closed')
{
$closedBugs[$groupKey][] = $bug;
}
else
{
if(!isset($kanbanGroup[$groupKey])) $kanbanGroup[$groupKey] = new stdclass();
$kanbanGroup[$groupKey]->bugs[$status][] = $bug;
}
}
else
{
@@ -2524,6 +2538,10 @@ class projectModel extends model
}
}
$kanbanGroup['closed'] = new stdclass();
if(isset($closedTasks)) $kanbanGroup['closed']->tasks = $closedTasks;
if(isset($closedBugs)) $kanbanGroup['closed']->bugs = $closedBugs;
$kanbanGroup['nokey'] = new stdclass();
if(isset($noKeyTasks)) $kanbanGroup['nokey']->tasks = $noKeyTasks;
if(isset($noKeyBugs)) $kanbanGroup['nokey']->bugs = $noKeyBugs;