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

* Fix bug #38674.

Browse Source
This commit is contained in:
hufangzhou
2023-09-18 02:29:28 +00:00
parent 0db54c6382
commit 057401bb77
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/css/task.css
+2
View File
@@ -25,3 +25,5 @@ body {margin-bottom: 10px;}
.dtable-row.is-normal .dtable-cell[data-col="name"] {padding-left: 20px;}
.dtable-cell[data-col="actions"] > .dtable-cell-content .c-actions .dividing-line {width: 1px; height: 16px; display: inline-block; vertical-align: middle; background: #F4F5F7; margin: 0 4px 0 0;}
span.delayed {display: inline-block; height: 20px; line-height: 18px; background: #FFEBEB; color: #FB2B2B; border-radius: 20px; padding: 2px 8px;}
module/task/config.php
+1 -1
View File
@@ -120,7 +120,7 @@ $config->task->datatable->fieldList['finishedBy']['sortType'] = true;
$config->task->datatable->fieldList['finishedBy']['required'] = 'no';
$config->task->datatable->fieldList['deadline']['title'] = 'deadlineAB';
$config->task->datatable->fieldList['deadline']['type'] = 'date';
$config->task->datatable->fieldList['deadline']['type'] = 'html';
$config->task->datatable->fieldList['deadline']['width'] = '70';
$config->task->datatable->fieldList['deadline']['fixed'] = 'no';
$config->task->datatable->fieldList['deadline']['sortType'] = true;
module/task/model.php
+9 -1
View File
@@ -4710,7 +4710,15 @@ class taskModel extends model
$task->mailto = implode('  ', $mailto);
foreach($userFields as $field) $task->$field = zget($users, $task->$field);
foreach($dateFields as $field) $task->$field = empty($task->$field) || helper::isZeroDate($task->$field) ? '' : $task->$field;
foreach($dateFields as $field)
{
$task->$field = empty($task->$field) || helper::isZeroDate($task->$field) ? '' : $task->$field;
if($field == 'deadline')
{
$delayed = isset($task->delay) ? "class='delayed'" : '';
$task->deadline = "<span $delayed>" . substr($task->deadline, 5, 6) . '</span>';
}
}
$children = isset($task->children) ? $task->children : array();
unset($task->children);