From 0a3df6b5ec034fe2586736bbae1934c3e4b1f373 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 23 Dec 2022 10:21:12 +0800 Subject: [PATCH] * fix bug #30254. --- module/project/js/common.js | 3 ++- module/project/view/batchedit.html.php | 1 + module/project/view/create.html.php | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/module/project/js/common.js b/module/project/js/common.js index 7af601555d..649d442331 100644 --- a/module/project/js/common.js +++ b/module/project/js/common.js @@ -253,6 +253,7 @@ function budgetOverrunTips() function outOfDateTip(currentID) { if(window.ignoreTips['dateTip']) return; + if(typeof(systemMode) != 'undefined' && systemMode == 'light') return; if(batchEditDateTips.includes(Number(currentID))) return; var end = currentID ? $('#ends\\[' + currentID + '\\]').val() : $('#end').val(); @@ -265,7 +266,7 @@ function outOfDateTip(currentID) { var selectedProgramID = currentID ? $("select[name='parents\[" + currentID + "\]']").val() : $('#parent').val(); - if(selectedProgramID == 0) return; + if(selectedProgramID == 0 || selectedProgramID == undefined) return; if(typeof(projectID) == 'undefined') projectID = 0; projectID = currentID ? $('#projectIdList\\['+ currentID + '\\]').val() : projectID; diff --git a/module/project/view/batchedit.html.php b/module/project/view/batchedit.html.php index ffadddce06..6c0bac55ef 100644 --- a/module/project/view/batchedit.html.php +++ b/module/project/view/batchedit.html.php @@ -17,6 +17,7 @@ project->beginLetterParent);?> project->endGreaterParent);?> +systemMode);?> project->longTime);?> project->ignore);?> project->edit->requiredFields;?> diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index 83beebd967..40e8406e74 100755 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -14,6 +14,7 @@ +systemMode);?> @@ -155,7 +156,7 @@
type != 'normal' and isset($branchGroups[$product->id]);?>
'> - product->common;?> + product->common;?> id, "class='form-control chosen' onchange='loadBranches(this)' data-last='" . $product->id . "' data-type='" . $product->type . "'");?>