From 53ebd44732b25ab97a4163a59fbd1b7834f0dbd9 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 25 Oct 2022 08:47:02 +0800 Subject: [PATCH 1/2] * Fix bug #28878. --- module/build/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/build/control.php b/module/build/control.php index 182eace820..881209923f 100644 --- a/module/build/control.php +++ b/module/build/control.php @@ -287,7 +287,7 @@ class build extends control $this->view->canBeChanged = common::canBeChanged('build', $build); // Determines whether an object is editable. $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->build = $build; - $this->view->buildPairs = $this->build->getBuildPairs(0, 0, 'noempty,notrunk', $build->execution, 'execution'); + $this->view->buildPairs = $this->build->getBuildPairs(0, 'all', 'noempty,notrunk', $build->execution, 'execution'); $this->view->actions = $this->loadModel('action')->getList('build', $buildID); $this->view->link = $link; $this->view->param = $param; From 1c7c989d1c2581f40e9fa2412d6d96d55a089638 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 25 Oct 2022 13:23:55 +0800 Subject: [PATCH 2/2] * Fix bug #28892. --- module/kanban/model.php | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/module/kanban/model.php b/module/kanban/model.php index 67fbf58948..26cfa7a485 100755 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -512,11 +512,10 @@ class kanbanModel extends model */ public function importCard($kanbanID, $regionID, $groupID, $columnID) { - $data = fixer::input('post')->get(); + $data = fixer::input('post')->get(); $importIDList = $data->cards; $targetLaneID = $data->targetLane; - - $oldCardsKanban = $this->dao->select('id,kanban')->from(TABLE_KANBANCARD)->where('id')->in($importIDList)->fetchPairs(); + $cardList = $this->dao->select('*')->from(TABLE_KANBANCARD)->where('id')->in($importIDList)->fetchAll('id'); $updateData = new stdClass(); $updateData->kanban = $kanbanID; @@ -524,6 +523,30 @@ class kanbanModel extends model $updateData->group = $groupID; $this->dao->update(TABLE_KANBANCARD)->data($updateData)->where('id')->in($importIDList)->exec(); + $kanban = $this->getByID($kanbanID); + $oldCardsKanban = array(); + $kanbanUsers = trim($kanban->owner) . ',' . trim($kanban->team); + $users = $this->loadModel('user')->getPairs('noclosed|nodeleted', '', 0, $kanbanUsers); + + foreach($cardList as $cardID => $card) + { + $oldCardsKanban[$cardID] = $card->kanban; + if(empty($card->assignedTo)) continue; + $assignedToList = explode(',', $card->assignedTo); + foreach($assignedToList as $index => $account) + { + if(!isset($users[$account])) unset($assignedToList[$index]); + } + + $assignedTo = implode(',', $assignedToList); + $assignedTo = trim($assignedTo, ','); + + if($card->assignedTo != $assignedTo) + { + $this->dao->update(TABLE_KANBANCARD)->set('assignedTo')->eq($assignedTo)->where('id')->eq($cardID)->exec(); + } + } + if(!dao::isError()) { $this->removeKanbanCell('common', $importIDList, $oldCardsKanban);