From 3a9f4d8adac393db57343cd7a7e4cd04451f8fbb Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Wed, 3 Aug 2022 07:16:28 +0000
Subject: [PATCH] * Fix bug#25897,22882

---
 module/execution/view/grouptask.html.php |  1 +
 module/project/js/execution.js           |  2 +-
 module/task/model.php                    | 14 +++++++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/module/execution/view/grouptask.html.php b/module/execution/view/grouptask.html.php
index d531a87e5c..6446735df7 100644
--- a/module/execution/view/grouptask.html.php
+++ b/module/execution/view/grouptask.html.php
@@ -226,6 +226,7 @@
         <td colspan='13'>
           <div class="table-row segments-list">
           <?php if($groupBy == 'assignedTo' and isset($members[$task->assignedTo])) printf($lang->execution->memberHours, zget($users, $task->assignedTo), $members[$task->assignedTo]->totalHours);?>
+          <?php if($groupBy == 'assignedTo' and $task->assignedTo and !isset($members[$task->assignedTo])) printf($lang->execution->memberHours, zget($users, $task->assignedTo), '0.0');?>
           <?php if($groupBy == 'assignedTo' and empty($task->assignedTo)):?>
             <div class="table-col">
               <div class="clearfix segments">
diff --git a/module/project/js/execution.js b/module/project/js/execution.js
index 43337d4ee6..2d050e7b6e 100644
--- a/module/project/js/execution.js
+++ b/module/project/js/execution.js
@@ -180,7 +180,7 @@ function showEditCheckbox(show)
         executionID = $tr.attr('data-id');
         if(show)
         {
-            var marginLeft = $tr.find('td:first').find('span.table-nest-icon').css('margin-left');
+            var marginLeft = '7px';
 
             $tr.find('td:first').prepend("<div class='checkbox-primary'><input type='checkbox' name='executionIDList[]' value='" + executionID + "' id='executionIDList" + executionID + "'/><label for='executionIDList" + executionID + "'></lable></div>");
             $tr.find('td:first').find('.checkbox-primary').css('margin-left', marginLeft).css('width', '14');
diff --git a/module/task/model.php b/module/task/model.php
index f8001be55f..3756a4694d 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -3626,6 +3626,18 @@ class taskModel extends model
     public function printAssignedHtml($task, $users)
     {
         $btnTextClass   = '';
+        if(!empty($task->team) and $task->mode == 'multi' and $task->status != 'closed')
+        {
+            $assignedToText = $this->lang->task->team;
+
+            $teamMembers = array();
+            foreach($task->team as $teamMember) $teamMembers[] = zget($users, $teamMember->account);
+            $assignedToTitle = implode($this->lang->comma, $teamMembers);
+        }
+        else
+        {
+            $assignedToText = $assignedToTitle = zget($users, $task->assignedTo);
+        }
         $assignedToText = (!empty($task->team) and $task->mode == 'multi' and $task->status != 'closed') ? $this->lang->task->team : zget($users, $task->assignedTo);
 
         if(empty($task->assignedTo))
@@ -3638,7 +3650,7 @@ class taskModel extends model
         $btnClass     = $task->assignedTo == 'closed' ? ' disabled' : '';
         $btnClass     = "iframe btn btn-icon-left btn-sm {$btnClass}";
         $assignToLink = $task->assignedTo == 'closed' ? '#' : helper::createLink('task', 'assignTo', "executionID=$task->execution&taskID=$task->id", '', true);
-        $assignToHtml = html::a($assignToLink, "<i class='icon icon-hand-right'></i> <span title='" . zget($users, $task->assignedTo) . "' class='{$btnTextClass}'>{$assignedToText}</span>", '', "class='$btnClass'");
+        $assignToHtml = html::a($assignToLink, "<i class='icon icon-hand-right'></i> <span title='" . $assignedToTitle . "' class='{$btnTextClass}'>{$assignedToText}</span>", '', "class='$btnClass'");
 
         echo !common::hasPriv('task', 'assignTo', $task) ? "<span style='padding-left: 21px' class='{$btnTextClass}'>{$assignedToText}</span>" : $assignToHtml;
     }