From e9bc72f2b25163ae873ae27de1260fd288a25c7a Mon Sep 17 00:00:00 2001 From: lanzongjun Date: Thu, 8 Dec 2022 15:56:30 +0800 Subject: [PATCH] * Finish Bug #30689 --- module/build/model.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/build/model.php b/module/build/model.php index ee1f92c4f8..8e6d83c85b 100644 --- a/module/build/model.php +++ b/module/build/model.php @@ -253,6 +253,7 @@ class buildModel extends model ->beginIF($products)->andWhere('product')->in($products)->fi() ->beginIF($objectType === 'execution' and $objectID)->andWhere('execution')->eq($objectID)->fi() ->beginIF($objectType === 'project' and $objectID)->andWhere('project')->eq($objectID)->fi() + ->beginIF(strpos($params, 'hasDeleted') === false)->andWhere('deleted')->eq(0)->fi() ->fetchPairs(); } @@ -456,7 +457,7 @@ class buildModel extends model ->get(); $product = $this->loadModel('product')->getByID($build->product); - if(!empty($product) and $product->type != 'normal' and $this->post->isIntegrated == 'no' and !isset($_POST['branch'])) + if(!empty($productgetBuildPairs) and $product->type != 'normal' and $this->post->isIntegrated == 'no' and !isset($_POST['branch'])) { $this->lang->product->branch = sprintf($this->lang->product->branch, $this->lang->product->branchName[$product->type]); dao::$errors['branch'] = sprintf($this->lang->error->notempty, $this->lang->product->branch);