From 6ba36fc282fce057e62ab336d1cd8c75fd375afd Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Tue, 7 Jun 2022 08:16:56 +0000
Subject: [PATCH 1/2] * Finish task#56387.

---
 module/task/view/view.html.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index a701242662..7917ebd228 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -12,6 +12,10 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
+<style>
+#assignedTo a {border-color: transparent;}
+#assignedTo a:hover {border-color: rgba(0,0,0,.2);}
+</style>
 <?php $browseLink = $app->session->taskList != false ? $app->session->taskList : $this->createLink('execution', 'browse', "executionID=$task->execution");?>
 <?php js::set('sysurl', common::getSysUrl());?>
 <?php if(strpos($_SERVER["QUERY_STRING"], 'isNotice=1') === false):?>
@@ -112,7 +116,7 @@
                 <th class='w-40px'> <?php echo $lang->task->lblPri;?></th>
                 <th>                <?php echo $lang->task->name;?></th>
                 <th class='w-100px'><?php echo $lang->task->deadline;?></th>
-                <th class='w-80px'> <?php echo $lang->task->assignedTo;?></th>
+                <th class='w-120px'> <?php echo $lang->task->assignedTo;?></th>
                 <th class='w-80px'> <?php echo $lang->task->status;?></th>
                 <th class='w-60px visible-lg'><?php echo $lang->task->consumedAB . $lang->task->lblHour;?></th>
                 <th class='w-60px visible-lg'><?php echo $lang->task->leftAB . $lang->task->lblHour;?></th>
@@ -132,13 +136,12 @@
                 </td>
                 <td class='text-left' title='<?php echo $child->name;?>'><a class="iframe" data-width="90%" href="<?php echo $this->createLink('task', 'view', "taskID=$child->id", '', true); ?>"><?php echo $child->name;?></a></td>
                 <td><?php echo $child->deadline;?></td>
-                <td><?php echo zget($users, $child->assignedTo);?></td>
+                <td id='assignedTo'><?php $this->task->printAssignedHtml($child, $users);?></td>
                 <td><?php echo $this->processStatus('task', $child);?></td>
                 <td class='visible-lg'><?php echo $child->consumed;?></td>
                 <td class='visible-lg'><?php echo $child->left;?></td>
                 <td class='c-actions'>
                   <?php
-                  common::printIcon('task', 'assignTo', "executionID=$child->execution&taskID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true);
                   common::printIcon('task', 'start',    "taskID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true);
                   common::printIcon('task', 'activate', "taskID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true);
                   common::printIcon('task', 'close',    "taskID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true);

From 49604b22482e9d2c8f43ac7be0abc5b20b86f49d Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Wed, 8 Jun 2022 07:10:02 +0000
Subject: [PATCH 2/2] * Adjust code.

---
 module/task/css/view.css       | 3 +++
 module/task/view/view.html.php | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/module/task/css/view.css b/module/task/css/view.css
index 2b55ebf2d2..2dd4437773 100644
--- a/module/task/css/view.css
+++ b/module/task/css/view.css
@@ -5,3 +5,6 @@
 .pull-left{max-width: 80%;}
 .MRThWidth {width: 90px !important;}
 .btn-edit-comment {z-index: 100;}
+
+#assignedTo a {border-color: transparent;}
+#assignedTo a:hover {border-color: rgba(0,0,0,.2);}
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index 7917ebd228..fd66f5def7 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -12,10 +12,6 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<style>
-#assignedTo a {border-color: transparent;}
-#assignedTo a:hover {border-color: rgba(0,0,0,.2);}
-</style>
 <?php $browseLink = $app->session->taskList != false ? $app->session->taskList : $this->createLink('execution', 'browse', "executionID=$task->execution");?>
 <?php js::set('sysurl', common::getSysUrl());?>
 <?php if(strpos($_SERVER["QUERY_STRING"], 'isNotice=1') === false):?>