This commit is contained in:
zhouxudong
2022-03-30 14:26:24 +08:00
parent 6b9eddc355
commit c86e39c093
2 changed files with 8 additions and 0 deletions
+5
View File
@@ -2158,6 +2158,11 @@ class execution extends control
unset($this->lang->kanban->type['all']);
}
if($execution->type == 'stage' and $execution->attribute != 'dev')
{
unset($this->lang->kanban->type['task']);
}
$kanbanGroup = $this->kanban->getExecutionKanban($executionID, $browseType, $groupBy);
if(empty($kanbanGroup))
{
+3
View File
@@ -1316,12 +1316,15 @@ class kanbanModel extends model
*/
public function getExecutionKanban($executionID, $browseType = 'all', $groupBy = 'default')
{
$execution = $this->loadModel('execution')->getById($executionID);
if($groupBy != 'default') return $this->getKanban4Group($executionID, $browseType, $groupBy);
$lanes = $this->dao->select('*')->from(TABLE_KANBANLANE)
->where('execution')->eq($executionID)
->andWhere('deleted')->eq(0)
->beginIF($browseType != 'all')->andWhere('type')->eq($browseType)->fi()
->beginIF($execution->type == 'stage' and $execution->attribute != 'dev')->andWhere('type')->ne('task')->fi()
->orderBy('order_asc')
->fetchAll('id');