From 7e35bd40f682136f8fb7dc07773ebd5ca1702cd8 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 15 May 2025 16:51:12 +0800 Subject: [PATCH] * [refac bug #62595] Adjust for estStart and deadline fields tip for child for edit task. --- module/task/js/edit.ui.js | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/module/task/js/edit.ui.js b/module/task/js/edit.ui.js index c71facfc9e..cd7ae4ed1e 100644 --- a/module/task/js/edit.ui.js +++ b/module/task/js/edit.ui.js @@ -442,22 +442,20 @@ function checkEstStartedAndDeadline(event) { if(taskDateLimit != 'limit') return; - const parent = $('[name=parent]').val(); - if(!parent) return; - const $form = $(event.target).closest('form'); const field = $(event.target).attr('name') const $estStarted = $form.find('[name=estStarted]'); const estStarted = $estStarted.val(); const $deadline = $form.find('[name=deadline]'); const deadline = $deadline.val(); + const hasParent = $('[name=parent]').val() != ''; const $estStartedDiv = $estStarted.closest('.form-group'); if(field == 'estStarted' && estStarted.length > 0) { $estStartedDiv.find('#estStartedTip').remove(); let $datetip = $('
'); - if(parentEstStarted.length > 0 && estStarted < parentEstStarted) $datetip.append('
' + overParentEstStartedLang + '
'); + if(hasParent && parentEstStarted.length > 0 && estStarted < parentEstStarted) $datetip.append('
' + overParentEstStartedLang + '
'); if(childDateLimit['estStarted'].length > 0 && estStarted > childDateLimit['estStarted']) { @@ -472,7 +470,7 @@ function checkEstStartedAndDeadline(event) { $deadlineDiv.find('#deadlineTip').remove(); let $datetip = $('
'); - if(parentDeadline.length > 0 && deadline > parentDeadline) $datetip.append('
' + overParentDeadlineLang + '
'); + if(hasParent && parentDeadline.length > 0 && deadline > parentDeadline) $datetip.append('
' + overParentDeadlineLang + '
'); if(childDateLimit['deadline'].length > 0 && deadline < childDateLimit['deadline']) { @@ -482,10 +480,13 @@ function checkEstStartedAndDeadline(event) $deadlineDiv.append($datetip); } - let $estStartedPicker = $estStarted.zui('datePicker'); - let $deadlinePicker = $deadline.zui('datePicker'); - $estStartedPicker.render({disabled: parentEstStarted == ''}); - $deadlinePicker.render({disabled: parentDeadline == ''}); - if(parentEstStarted == '') $estStartedPicker.$.setValue(''); - if(parentDeadline == '') $deadlinePicker.$.setValue(''); + if(hasParent) + { + let $estStartedPicker = $estStarted.zui('datePicker'); + let $deadlinePicker = $deadline.zui('datePicker'); + $estStartedPicker.render({disabled: parentEstStarted == ''}); + $deadlinePicker.render({disabled: parentDeadline == ''}); + if(parentEstStarted == '') $estStartedPicker.$.setValue(''); + if(parentDeadline == '') $deadlinePicker.$.setValue(''); + } }