From 87539dd365ab2a2a93a2e7bb2bda77bdd0a07d93 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Wed, 3 Jan 2024 09:01:15 +0800 Subject: [PATCH] * Fix bug #42277. --- module/productplan/js/create.ui.js | 7 ++++++- module/productplan/ui/create.html.php | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/module/productplan/js/create.ui.js b/module/productplan/js/create.ui.js index 824a338fbd..17c9a854d0 100644 --- a/module/productplan/js/create.ui.js +++ b/module/productplan/js/create.ui.js @@ -8,7 +8,12 @@ window.clickSubmit = function() const parentPlan = $('input[name=parent]').val(); const branches = $('select[name^=branch]').val(); const title = $('input[name=title]').val(); - if(parentPlan > 0 && branches && title) + const begin = $('input[name=begin]').val(); + const end = $('input[name=end]').val(); + const errorBegin = begin && parentBegin && begin < parentBegin; + const errorEnd = end && parentEnd && end > parentEnd; + + if(parentPlan > 0 && branches && title && !errorBegin && !errorEnd) { const link = $.createLink('productplan', 'ajaxGetDiffBranchesTip', "productID=" + productID + "&parentID=" + parentPlan + "&branches=" + branches.toString()); $.get(link, function(diffBranchesTip) diff --git a/module/productplan/ui/create.html.php b/module/productplan/ui/create.html.php index ed07c0d24a..c365d35b6e 100644 --- a/module/productplan/ui/create.html.php +++ b/module/productplan/ui/create.html.php @@ -14,6 +14,8 @@ jsVar('weekend', $config->execution->weekend); jsVar('productID', $product->id); jsVar('lastLang', $lang->productplan->last); jsVar('parentPlanID', $parent); +jsVar('parentBegin', isset($parentPlan->begin) ? $parentPlan->begin : ''); +jsVar('parentEnd', isset($parentPlan->end) ? $parentPlan->end : ''); if($parent) {