From c03939c7e7ad7673a22df9f0778466c60c4d68f1 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Fri, 14 Jan 2022 13:06:12 +0800 Subject: [PATCH] * Modify the create independent lane of common signboard. --- module/kanban/model.php | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/module/kanban/model.php b/module/kanban/model.php index 952179dfa3..086dd7ac44 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -318,7 +318,7 @@ class kanbanModel extends model /* Add kanban cell. */ $lanes = $this->dao->select('id')->from(TABLE_KANBANLANE)->where('`group`')->eq($column->group)->fetchPairs(); $kanbanID = $this->dao->select('kanban')->from(TABLE_KANBANREGION)->where('id')->eq($regionID)->fetch('kanban'); - foreach($lanes as $laneID) $this->addKanbanCell($kanbanID, $laneID, $columnID, 'card'); + foreach($lanes as $laneID) $this->addKanbanCell($kanbanID, $laneID, $columnID, 'common'); return $columnID; } @@ -449,7 +449,7 @@ class kanbanModel extends model $cardID = $this->dao->lastInsertID(); $this->file->saveUpload('kanbancard', $cardID); $this->file->updateObjectID($this->post->uid, $cardID, 'kanbancard'); - $this->addKanbanCell($kanbanID, $laneID, $columnID, 'card', $cardID); + $this->addKanbanCell($kanbanID, $laneID, $columnID, 'common', $cardID); return $cardID; } @@ -1374,17 +1374,12 @@ class kanbanModel extends model $laneID = $this->dao->lastInsertID(); if($lane->type != 'common' and isset($mode) and $mode == 'independent') $this->createRDColumn($regionID, $lane->group, $laneID, $lane->type, $kanbanID); - if(isset($mode) and $mode == 'sameAsOther') + if(isset($mode) and ($mode == 'sameAsOther' or ($lane->type == 'common' and $mode == 'independent'))) { $columnIDList = $this->dao->select('id')->from(TABLE_KANBANCOLUMN)->where('deleted')->eq(0)->andWhere('archived')->eq(0)->andWhere('`group`')->eq($lane->group)->fetchPairs(); foreach($columnIDList as $columnID) { - $data = new stdclass(); - $data->kanban = $kanbanID; - $data->lane = $laneID; - $data->column = $columnID; - $data->type = $lane->type; - $this->dao->insert(TABLE_KANBANCELL)->data($data)->exec(); + $this->addKanbanCell($kanbanID, $laneID, $columnID, $lane->type); if(dao::isError()) return false; }