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 @@
assignedTo])) printf($lang->execution->memberHours, zget($users, $task->assignedTo), $members[$task->assignedTo]->totalHours);?>
+ assignedTo and !isset($members[$task->assignedTo])) printf($lang->execution->memberHours, zget($users, $task->assignedTo), '0.0');?>
assignedTo)):?>
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(" ");
$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, " {$assignedToText}", '', "class='$btnClass'");
+ $assignToHtml = html::a($assignToLink, " {$assignedToText}", '', "class='$btnClass'");
echo !common::hasPriv('task', 'assignTo', $task) ? " {$assignedToText}" : $assignToHtml;
}
|