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

* Resoled issue #656.

Browse Source
This commit is contained in:
tianshujie
2022-06-02 13:16:37 +08:00
parent fb239cfa06
commit c170d62313
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/model.php
+6 -4
View File
@@ -1595,9 +1595,6 @@ class kanbanModel extends model
if(!isset($groupByList[$item->$groupBy])) $groupByList[$item->$groupBy] = $item->$groupBy;
}
if(in_array($groupBy, array('module', 'story', 'pri', 'severity'))) $objectPairs[0] = $this->lang->$browseType->$groupBy . ': ' . $this->lang->kanban->noGroup;
if(in_array($groupBy, array('assignedTo', 'type', 'category', 'source'))) $objectPairs[''] = $this->lang->$browseType->$groupBy . ': ' . $this->lang->kanban->noGroup;
if(in_array($groupBy, array('module', 'story', 'assignedTo')))
{
if($groupBy == 'module')
@@ -1626,14 +1623,19 @@ class kanbanModel extends model
}
else
{
unset($this->lang->$browseType->{$groupBy . 'List'}[0]);
unset($this->lang->$browseType->{$groupBy . 'List'}['']);
$objectPairs += $this->lang->$browseType->{$groupBy . 'List'};
}
if(in_array($groupBy, array('module', 'story', 'pri', 'severity'))) $objectPairs[0] = $this->lang->$browseType->$groupBy . ': ' . $this->lang->kanban->noGroup;
if(in_array($groupBy, array('assignedTo', 'source'))) $objectPairs[] = $this->lang->$browseType->$groupBy . ': ' . $this->lang->kanban->noGroup;
$laneColor = 0;
$order = 1;
foreach($objectPairs as $objectID => $objectName)
{
if(!isset($groupByList[$objectID]) and $objectID) continue;
if(!isset($groupByList[$objectID]) and $objectID and !in_array($objectID, array('feature', 'design'))) continue;
$lane = new stdclass();
$lane->id = $groupBy . $objectID;