From 3d211b68b05b09de6a7473539a416531d9df31ad Mon Sep 17 00:00:00 2001 From: Yagami Date: Tue, 1 Nov 2022 16:09:54 +0800 Subject: [PATCH] * Finish task #74209. --- module/build/control.php | 4 +++- module/build/model.php | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/module/build/control.php b/module/build/control.php index 7d1fd86c93..5d48cdabe7 100644 --- a/module/build/control.php +++ b/module/build/control.php @@ -310,11 +310,13 @@ class build extends control $this->executeHooks($buildID); + $buildIdList = $build->execution ? array() : array($buildID => $buildID); + /* Assign. */ $this->view->canBeChanged = common::canBeChanged('build', $build); // Determines whether an object is editable. $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->build = $build; - $this->view->buildPairs = $this->build->getBuildPairs(0, 'all', 'noempty,notrunk', $build->execution, 'execution'); + $this->view->buildPairs = $this->build->getBuildPairs(0, 'all', 'noempty,notrunk', $build->execution, 'execution', $buildIdList); $this->view->actions = $this->loadModel('action')->getList('build', $buildID); $this->view->link = $link; $this->view->param = $param; diff --git a/module/build/model.php b/module/build/model.php index 9debed159f..cb538f3486 100644 --- a/module/build/model.php +++ b/module/build/model.php @@ -235,6 +235,7 @@ class buildModel extends model ->beginIF($products)->andWhere('t1.product')->in($products)->fi() ->beginIF($objectType === 'execution' and $objectID)->andWhere('t1.execution')->eq($objectID)->fi() ->beginIF($objectType === 'project' and $objectID)->andWhere('t1.project')->eq($objectID)->fi() + ->beginIF($objectType === 'execution' and !$objectID)->andWhere('t1.id')->in($buildIdList)->fi() ->beginIF($branch !== 'all')->andWhere('t1.branch')->in("0,$branch")->fi() ->orderBy('t1.date desc, t1.id desc')->fetchAll('id');