From 45bf2f3044c2388de42c020f567845fb7ce10f69 Mon Sep 17 00:00:00 2001 From: wangyuting Date: Thu, 15 May 2025 06:32:36 +0000 Subject: [PATCH] * [bug#62550,done,2h,0h] Fix kanban task connection error. --- module/programplan/tao.php | 11 ++++++----- module/programplan/ui/ganttfields.html.php | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/module/programplan/tao.php b/module/programplan/tao.php index aee10c40f6..3e788f8f9f 100644 --- a/module/programplan/tao.php +++ b/module/programplan/tao.php @@ -278,11 +278,12 @@ class programplanTao extends programplanModel foreach($tasks as $task) { - $plan = zget($plans, $task->execution, null); - $dateLimit = $this->getTaskDateLimit($task, $plan); - $data = $this->buildTaskDataForGantt($task, $dateLimit); - $data->id = $task->execution . '-' . $task->id; - $data->parent = $task->parent > 0 && isset($tasks[$task->parent]) ? $task->execution . '-' . $task->parent : $task->execution; + $plan = zget($plans, $task->execution, null); + $dateLimit = $this->getTaskDateLimit($task, $plan); + $data = $this->buildTaskDataForGantt($task, $dateLimit); + $data->id = $task->execution . '-' . $task->id; + $data->parent = $task->parent > 0 && isset($tasks[$task->parent]) ? $task->execution . '-' . $task->parent : $task->execution; + $data->allowLinks = $plan->type == 'kanban' ? false : true; if(!isset($executions[$task->execution])) $executions[$task->execution] = $this->dao->select('status')->from(TABLE_EXECUTION)->where('id')->eq($task->execution)->fetch('status'); /* Determines if the object is delay. */ diff --git a/module/programplan/ui/ganttfields.html.php b/module/programplan/ui/ganttfields.html.php index ad2f036683..5c1cb850b5 100644 --- a/module/programplan/ui/ganttfields.html.php +++ b/module/programplan/ui/ganttfields.html.php @@ -32,6 +32,7 @@ $ganttLang->deleteRelation = $lang->execution->gantt->confirmDelete; $ganttLang->wrongRelation = $lang->execution->error->wrongGanttRelation; $ganttLang->wrongRelationSource = $lang->execution->error->wrongGanttRelationSource; $ganttLang->wrongRelationTarget = $lang->execution->error->wrongGanttRelationTarget; +$ganttLang->wrongKanbanTasks = $lang->execution->error->wrongKanbanTasks; $typeHtml = '' . $lang->programplan->ganttBrowseType[$ganttType] . ''; $typeHtml .= '';