From d1576572ff653f56abf830c483f72a4c2359b76b Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Thu, 25 Aug 2022 06:49:05 +0000
Subject: [PATCH] *Fix bug

---
 extension/lite/my/ext/view/task.html.php | 5 +++--
 module/block/view/taskblock.html.php     | 7 +++++--
 module/my/view/task.html.php             | 5 +++--
 module/user/view/task.html.php           | 7 +++++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/extension/lite/my/ext/view/task.html.php b/extension/lite/my/ext/view/task.html.php
index 032ccfee7a..01f53c561d 100644
--- a/extension/lite/my/ext/view/task.html.php
+++ b/extension/lite/my/ext/view/task.html.php
@@ -95,8 +95,9 @@
             }
             else
             {
-                $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'");
+                $onlybody = $task->executionType == 'kanban' ?  true : '';
+                $class    = $task->executionType == 'kanban' ? 'iframe' : '';
+                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'");
             }
             ?>
             <?php if(!empty($task->children)) echo '<a class="task-toggle" data-id="' . $task->id . '"><i class="icon icon-angle-double-right"></i></a>';?>
diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php
index aacaca3a69..1a40a154b9 100644
--- a/module/block/view/taskblock.html.php
+++ b/module/block/view/taskblock.html.php
@@ -44,8 +44,11 @@
       <tr>
         <td class='c-id-xs'><?php echo sprintf('%03d', $task->id);?></td>
         <td class='c-pri <?php if($longBlock) echo "c-pri-long"?>'><span class='label-pri label-pri-<?php echo $task->pri;?>' title='<?php echo zget($lang->task->priList, $task->pri, $task->pri)?>'><?php echo zget($lang->task->priList, $task->pri, $task->pri)?></span></td>
-        <?php $class = ($task->executionType == 'kanban') ? 'iframe' : '';?>
-        <td class='c-name' style='color: <?php echo $task->color?>' title='<?php echo $task->name?>'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', true, $task->project), $task->name, null, "class='$class' data-width='80%' data-toggle='modal'")?></td>
+        <?php
+            $onlybody = $task->executionType == 'kanban' ? true : '';
+            $class    = $task->executionType == 'kanban' ? "class='iframe' data-toggle='modal'" : '';
+        ?>
+        <td class='c-name' style='color: <?php echo $task->color?>' title='<?php echo $task->name?>'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', $onlybody, $task->project), $task->name, null, "$class data-width='80%'")?></td>
         <?php if($longBlock):?>
         <td class='c-estimate text-center' title="<?php echo $task->estimate . ' ' . $lang->execution->workHour;?>"><?php echo $task->estimate . $lang->execution->workHourUnit;?></td>
         <td class='c-deadline'><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index 14af9270fd..69b47b7bfc 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -108,8 +108,9 @@
               }
               else
               {
-                  $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'");
+                  $onlybody = $task->executionType == 'kanban' ?  true : '';
+                  $class    = $task->executionType == 'kanban' ? 'iframe' : '';
+                  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'");
               }
               ?>
               <?php if(!empty($task->children)) echo '<a class="task-toggle" data-id="' . $task->id . '"><i class="icon icon-angle-double-right"></i></a>';?>
diff --git a/module/user/view/task.html.php b/module/user/view/task.html.php
index 8c9999fd4d..0dbd01df7d 100644
--- a/module/user/view/task.html.php
+++ b/module/user/view/task.html.php
@@ -61,8 +61,11 @@
           <td class='text-left nobr'>
             <?php if(!empty($task->team))   echo '<span class="label label-badge label-light">' . $this->lang->task->multipleAB . '</span> ';?>
             <?php if($task->parent > 0) echo '<span class="label label-badge label-light">' . $this->lang->task->childrenAB . '</span> ';?>
-            <?php $class = ($task->executionType == 'kanban') ? 'iframe' : '';?>
-            <?php 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'");?>
+            <?php
+                  $onlybody = $task->executionType == 'kanban' ? true : '';
+                  $class    = $task->executionType == 'kanban' ? 'iframe' : '';
+            ?>
+            <?php 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'");?>
           </td>
           <td class='hours' title="<?php echo $task->estimate . ' ' . $lang->execution->workHour;?>"><?php echo $task->estimate . $lang->execution->workHourUnit;?></td>
           <td class='hours' title="<?php echo $task->consumed . ' ' . $lang->execution->workHour;?>"><?php echo $task->consumed . $lang->execution->workHourUnit;?></td>