Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug#25897,22882

Browse Source
This commit is contained in:
zenggang
2022-08-03 07:16:28 +00:00
parent ed719f768f
commit 3a9f4d8ada
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/view/grouptask.html.php
+1
View File
@@ -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">
module/project/js/execution.js
+1 -1
View File
@@ -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');
module/task/model.php
+13 -1
View File
@@ -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;
}