From 8c9bc30e100b72209e5960da440812e9d274dfe9 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 27 Jan 2025 13:50:09 +0800 Subject: [PATCH] * [bug#59443,done,1h] fix fromVersion error. --- module/testcase/model.php | 7 ------- module/testcase/tao.php | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/module/testcase/model.php b/module/testcase/model.php index 428117cb23..aed658025b 100755 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -637,13 +637,6 @@ class testcaseModel extends model if($oldCase->version != $case->version || !empty($case->stepChanged)) $this->testcaseTao->updateStep($case, $oldCase); - if($oldCase->lib && empty($oldCase->product)) - { - $fromcaseVersion = $this->dao->select('fromCaseVersion')->from(TABLE_CASE)->where('fromCaseID')->eq($case->id)->fetch('fromCaseVersion'); - $fromcaseVersion = (int)$fromcaseVersion + 1; - $this->dao->update(TABLE_CASE)->set('`fromCaseVersion`')->eq($fromcaseVersion)->where('`fromCaseID`')->eq($case->id)->exec(); - } - if(isset($oldCase->toBugs) && isset($case->linkBug)) $this->testcaseTao->linkBugs($oldCase->id, array_keys($oldCase->toBugs), $case); if($case->branch && !empty($testtasks)) $this->testcaseTao->unlinkCaseFromTesttask($oldCase->id, $case->branch, $testtasks); diff --git a/module/testcase/tao.php b/module/testcase/tao.php index 36fded9dea..040821c83c 100644 --- a/module/testcase/tao.php +++ b/module/testcase/tao.php @@ -486,6 +486,13 @@ class testcaseTao extends testcaseModel */ protected function updateStep(object $case, object $oldCase): bool { + if($oldCase->lib && empty($oldCase->product)) + { + $fromcaseVersion = $this->dao->select('fromCaseVersion')->from(TABLE_CASE)->where('fromCaseID')->eq($case->id)->fetch('fromCaseVersion'); + $fromcaseVersion = (int)$fromcaseVersion + 1; + $this->dao->update(TABLE_CASE)->set('`fromCaseVersion`')->eq($fromcaseVersion)->where('`fromCaseID`')->eq($case->id)->exec(); + } + if($case->steps) { $this->insertSteps($oldCase->id, $case->steps, $case->expects, (array)$case->stepType, $case->version);