From e863a2c792ee27b9c814a67a5e8ed4709bbac6f4 Mon Sep 17 00:00:00 2001 From: liuhong Date: Fri, 19 Aug 2022 05:30:24 +0000 Subject: [PATCH] *Fix bug 64879. --- extension/lite/my/ext/view/task.html.php | 4 ++-- module/block/view/taskblock.html.php | 4 ++-- module/my/view/task.html.php | 4 ++-- module/user/view/task.html.php | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/extension/lite/my/ext/view/task.html.php b/extension/lite/my/ext/view/task.html.php index 01fec6c851..75884731c2 100644 --- a/extension/lite/my/ext/view/task.html.php +++ b/extension/lite/my/ext/view/task.html.php @@ -95,8 +95,8 @@ } else { - $task->executionType == 'kanban' ? ($class = 'iframe').($onlybody = true) : ($class = '').($onlybody = ''); - echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', "{$onlybody}", $task->project), $task->name, null,"class={$class} data-width='80%' style='color: $task->color'"); + $class = ($task->executionType == 'kanban') ? 'iframe' : ''; + echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', true, $task->project), $task->name, null,"class={$class} data-width='80%' style='color: $task->color'"); } ?> children)) echo '';?> diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php index e3d7621e72..d4b28b0533 100644 --- a/module/block/view/taskblock.html.php +++ b/module/block/view/taskblock.html.php @@ -44,8 +44,8 @@ id);?> task->priList, $task->pri, $task->pri)?> - executionType == 'kanban' ? ($class = 'iframe').($onlybody = true) : ($class = '').($onlybody = '');?> - createLink('task', 'view', "taskID=$task->id", '', "{$onlybody}", $task->project), $task->name, null, "class={$class} data-width='80%' data-toggle='modal'")?> + executionType == 'kanban') ? 'iframe' : '';?> + createLink('task', 'view', "taskID=$task->id", '', true, $task->project), $task->name, null, "class={$class} data-width='80%' data-toggle='modal'")?> 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 2b2c166bae..37cd83134f 100644 --- a/module/my/view/task.html.php +++ b/module/my/view/task.html.php @@ -108,8 +108,8 @@ } else { - $task->executionType == 'kanban' ? ($class = 'iframe').($onlybody = true) : ($class = '').($onlybody = ''); - echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', "{$onlybody}", $task->project), $task->name, null,"class={$class} data-width='80%' style='color: $task->color'"); + $class = ($task->executionType == 'kanban') ? 'iframe' : ''; + echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', true, $task->project), $task->name, null,"class={$class} data-width='80%' style='color: $task->color'"); } ?> children)) echo '';?> diff --git a/module/user/view/task.html.php b/module/user/view/task.html.php index 322435564a..1d9db58df2 100644 --- a/module/user/view/task.html.php +++ b/module/user/view/task.html.php @@ -61,8 +61,8 @@ team)) echo '' . $this->lang->task->multipleAB . ' ';?> parent > 0) echo '' . $this->lang->task->childrenAB . ' ';?> - executionType == 'kanban' ? ($class = 'iframe').($onlybody = true) : ($class = '').($onlybody = '');?> - createLink('task', 'view', "taskID=$task->id", '', "{$onlybody}", $task->project), $task->name, null,"class={$class} data-width='80%' style='color: $task->color'");?> + executionType == 'kanban') ? 'iframe' : '';?> + createLink('task', 'view', "taskID=$task->id", '', true, $task->project), $task->name, null,"class={$class} data-width='80%' style='color: $task->color'");?> estimate . $lang->execution->workHourUnit;?> consumed . $lang->execution->workHourUnit;?>