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

* [refac bug #62741] Adjust for child task estStarted and deadline value when parent is empty.

Browse Source
This commit is contained in:
wangyidong
2025-05-23 17:00:21 +08:00
parent fd5276c5d4
commit 8ab2763336
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/js/batchedit.ui.js
+2
View File
@@ -42,6 +42,7 @@ window.renderRowData = function($row, index, row)
if(parentTask.estStarted == '')
{
row.estStarted = '';
if(parentTasks[row.id] != undefined) parentTasks[row.id].estStarted = '';
info[0].render({readonly: true});
}
});
@@ -50,6 +51,7 @@ window.renderRowData = function($row, index, row)
if(parentTask.deadline == '')
{
row.deadline = '';
if(parentTasks[row.id] != undefined) parentTasks[row.id].deadline = '';
info[0].render({readonly: true});
}
});
module/task/ui/edit.html.php
+7 -4
View File
@@ -73,6 +73,9 @@ $closedReasonOptions = $lang->task->reasonList;
$teamOptions = $members;
$hiddenTeam = $task->mode != '' ? '' : 'hidden';
$disabledEstStarted = $project && $project->taskDateLimit == 'limit' && !empty($parentTask) && helper::isZeroDate($parentTask->estStarted) ? true : false;
$disabledDeadline = $project && $project->taskDateLimit == 'limit' && !empty($parentTask) && helper::isZeroDate($parentTask->deadline) ? true : false;
if($task->status == 'wait') unset($statusOptions['pause']);
if(!empty($task->team))
@@ -467,9 +470,9 @@ detailBody
datePicker
(
set::name('estStarted'),
set::disabled($project && $project->taskDateLimit == 'limit' && !empty($parentTask) && helper::isZeroDate($parentTask->estStarted) ? true : false),
set::disabled($disabledEstStarted),
on::change('checkEstStartedAndDeadline'),
helper::isZeroDate($task->estStarted) ? null : set::value($task->estStarted)
set::value((helper::isZeroDate($task->estStarted) || $disabledEstStarted) ? null : $task->estStarted)
)
)
),
@@ -482,9 +485,9 @@ detailBody
datePicker
(
set::name('deadline'),
set::disabled($project && $project->taskDateLimit == 'limit' && !empty($parentTask) && helper::isZeroDate($parentTask->deadline) ? true : false),
set::disabled($disabledDeadline),
on::change('checkEstStartedAndDeadline'),
helper::isZeroDate($task->deadline) ? null : set::value($task->deadline)
set::value((helper::isZeroDate($task->deadline) || $disabledDeadline) ? null : $task->deadline)
)
)
),