From 6b6f9c39eee5eec11555cc032a46dbe6edde2ac2 Mon Sep 17 00:00:00 2001 From: liuhong Date: Wed, 17 Aug 2022 07:32:36 +0000 Subject: [PATCH] *Finish task #64879. --- module/block/view/taskblock.html.php | 3 ++- module/my/view/task.html.php | 3 ++- module/user/view/task.html.php | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php index 795761def4..cd1efb6c2a 100644 --- a/module/block/view/taskblock.html.php +++ b/module/block/view/taskblock.html.php @@ -44,7 +44,8 @@ id);?> task->priList, $task->pri, $task->pri)?> - createLink('task', 'view', "taskID=$task->id", '', '', $task->project), $task->name)?> + executionType == 'kanban' ? ($class = 'iframe').($onlybody = 'onlybody=yes') : ($class = '').($onlybody = '');?> + createLink('task', 'view', "taskID=$task->id", '', "{$onlybody}", $task->project), $task->name, null,"class={$class}")?> estimate . $lang->execution->workHourUnit;?> deadline, 0, 4) > 0) echo $task->deadline;?> diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php index 1829214482..e55ce44060 100644 --- a/module/my/view/task.html.php +++ b/module/my/view/task.html.php @@ -108,7 +108,8 @@ } else { - echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', '', $task->project), $task->name, null, "style='color: $task->color'"); + $task->executionType == 'kanban' ? ($class = 'iframe').($onlybody = 'onlybody=yes') : ($class = '').($onlybody = ''); + echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', "{$onlybody}", $task->project), $task->name, null,"class={$class} style='color: $task->color'"); } ?> children)) echo '';?> diff --git a/module/user/view/task.html.php b/module/user/view/task.html.php index afd669394d..dc5f7be8a4 100644 --- a/module/user/view/task.html.php +++ b/module/user/view/task.html.php @@ -61,7 +61,8 @@ team)) echo '' . $this->lang->task->multipleAB . ' ';?> parent > 0) echo '' . $this->lang->task->childrenAB . ' ';?> - createLink('task', 'view', "taskID=$task->id"), $task->name, null, "style='color: $task->color'");?> + executionType == 'kanban' ? ($class = 'iframe').($onlybody = 'onlybody=yes') : ($class = '').($onlybody = '');?> + createLink('task', 'view', "taskID=$task->id", '', "{$onlybody}", $task->project), $task->name, null,"class={$class} style='color: $task->color'");?> estimate . $lang->execution->workHourUnit;?> consumed . $lang->execution->workHourUnit;?>