From eed1ad1f1805783f95b9ce93bbd74ae94d0a13c6 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 19 Jun 2025 14:06:18 +0800 Subject: [PATCH 1/2] * [unittest] fix syncnomultiplesprint error. --- .../execution/test/lib/execution.unittest.class.php | 9 +++++---- .../execution/test/model/syncnomultiplesprint.php | 13 +++++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/module/execution/test/lib/execution.unittest.class.php b/module/execution/test/lib/execution.unittest.class.php index b074607c63..fb44b4ae75 100644 --- a/module/execution/test/lib/execution.unittest.class.php +++ b/module/execution/test/lib/execution.unittest.class.php @@ -2408,13 +2408,14 @@ class executionTest /** * Test sync no multiple sprint. * - * @param int $projectID + * @param int $projectID * @access public - * @return void + * @return string|object */ - public function syncNoMultipleSprintTest(int $projectID): int + public function syncNoMultipleSprintTest(int $projectID): string|object { - return $this->executionModel->syncNoMultipleSprint($projectID); + $executionID = $this->executionModel->syncNoMultipleSprint($projectID); + return !$executionID ? '' : $this->executionModel->fetchByID($executionID); } /** diff --git a/module/execution/test/model/syncnomultiplesprint.php b/module/execution/test/model/syncnomultiplesprint.php index ecc3c839ad..24f666fd0e 100755 --- a/module/execution/test/model/syncnomultiplesprint.php +++ b/module/execution/test/model/syncnomultiplesprint.php @@ -1,12 +1,17 @@ #!/usr/bin/env php syncNoMultipleSprint(); +timeout=0 cid=0 -- 同步没有执行的项目 @5 +sed: can't read /repo/zentaopms/test/config/my.php: No such file or directory +- 同步没有执行的项目 + - 属性id @5 + - 属性name @项目2 + - 属性project @2 + - 属性multiple @0 - 同步错误的项目 @0 */ @@ -47,5 +52,5 @@ su('admin'); $projectIDList = array(2, 15); $execution = new executionTest(); -r($execution->syncNoMultipleSprintTest($projectIDList[0])) && p() && e('5'); // 同步没有执行的项目 -r($execution->syncNoMultipleSprintTest($projectIDList[1])) && p() && e('0'); // 同步错误的项目 +r($execution->syncNoMultipleSprintTest($projectIDList[0])) && p('id,name,project,multiple') && e('5,项目2,2,0'); // 同步没有执行的项目 +r($execution->syncNoMultipleSprintTest($projectIDList[1])) && p() && e('0'); // 同步错误的项目 From db5618b6afe8f2686621110bbf37871c61ef63f8 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 19 Jun 2025 14:06:29 +0800 Subject: [PATCH 2/2] * [bug#63474,done,0.5h] fix edit a project error. --- module/execution/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/execution/model.php b/module/execution/model.php index ba1eb0ac56..247e88370d 100755 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -5125,7 +5125,7 @@ class executionModel extends model /* Handle extend fields. */ $extendFields = $this->loadModel('project')->getFlowExtendFields($projectID); - foreach($extendFields as $field) $_POST[$field->field] = $project->field; + foreach($extendFields as $field) $_POST[$field->field] = $project->{$field->field}; if(isset($this->config->setCode) and $this->config->setCode == 1) $postData->code = $project->code; $updateProductsData = new stdclass();