From fc51e379f0986340e1a10b8695b9bd67a61df90f Mon Sep 17 00:00:00 2001 From: wangyuting <851424971@qq.com> Date: Mon, 28 Nov 2022 05:22:22 +0000 Subject: [PATCH] * Finish task #77611. --- module/build/model.php | 2 -- module/testtask/config.php | 4 ++-- module/testtask/control.php | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/module/build/model.php b/module/build/model.php index f9dae4d54a..1e9f333b90 100644 --- a/module/build/model.php +++ b/module/build/model.php @@ -621,8 +621,6 @@ class buildModel extends model { $action = strtolower($action); - if($module == 'testtask' && $action == 'create') return !!$object->execution; - return true; } diff --git a/module/testtask/config.php b/module/testtask/config.php index d6cbc1425d..43e669c8c3 100644 --- a/module/testtask/config.php +++ b/module/testtask/config.php @@ -2,8 +2,8 @@ $config->testtask = new stdclass(); $config->testtask->create = new stdclass(); $config->testtask->edit = new stdclass(); -$config->testtask->create->requiredFields = 'execution,build,begin,end,name'; -$config->testtask->edit->requiredFields = 'execution,build,begin,end,name'; +$config->testtask->create->requiredFields = 'build,begin,end,name'; +$config->testtask->edit->requiredFields = 'build,begin,end,name'; $config->testtask->importUnit = new stdclass(); $config->testtask->importUnit->requiredFields = 'execution,build,begin,end,name,resultFile'; diff --git a/module/testtask/control.php b/module/testtask/control.php index b25782e1c9..85298a54ed 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -517,7 +517,7 @@ class testtask extends control /* Get execution type and set assignedToList. */ $execution = $this->execution->getById($task->execution); - if($execution->acl == 'private') + if($execution and $execution->acl == 'private') { $assignedToList = $this->loadModel('user')->getTeamMemberPairs($execution->id, 'execution', 'nodeleted'); }