From a2421b85bbca10545c9521e43fd1793fed2db51a Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 17 Jun 2022 11:37:40 +0800 Subject: [PATCH 1/2] * Modify Edit logic for switching program. --- module/project/control.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/module/project/control.php b/module/project/control.php index bf493b29ce..451a4bda0d 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -2005,17 +2005,22 @@ class project extends control $response['newProducts'] = html::select("newProducts", array('0' => '') + $newProducts, '', "class='form-control chosen' onchange='loadBranches(this)'"); $multiLinkedProducts = $this->project->getMultiLinkedProducts($projectID); + $canChange = true; if($multiLinkedProducts) { $multiLinkedProjects = array(); + $programIdList = $this->dao->select('id, program')->from(TABLE_PRODUCT)->where('id')->in(array_keys($multiLinkedProducts))->fetchPairs(); foreach($multiLinkedProducts as $productID => $product) { + if($programIdList[$productID] != $programID) $canChange = false; $multiLinkedProjects[$productID] = $this->loadModel('product')->getProjectPairsByProduct($productID); } $response['result'] = false; $response['message'] = $multiLinkedProducts; $response['multiLinkedProjects'] = $multiLinkedProjects; } + + if($canChange) return true; echo json_encode($response); } From a974f333d27a54f9dff79970da2c25b7d7a1cee0 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 17 Jun 2022 11:46:43 +0800 Subject: [PATCH 2/2] * Modify Edit logic for switching program. --- module/project/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/project/control.php b/module/project/control.php index 451a4bda0d..e62ada520e 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -2012,7 +2012,7 @@ class project extends control $programIdList = $this->dao->select('id, program')->from(TABLE_PRODUCT)->where('id')->in(array_keys($multiLinkedProducts))->fetchPairs(); foreach($multiLinkedProducts as $productID => $product) { - if($programIdList[$productID] != $programID) $canChange = false; + if($programIdList[$productID] != $newTopPGM) $canChange = false; $multiLinkedProjects[$productID] = $this->loadModel('product')->getProjectPairsByProduct($productID); } $response['result'] = false;