From 0b0882cba89bb7fc42a3eaf9568dbc2a080a9c40 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Tue, 26 Mar 2019 15:01:01 +0800 Subject: [PATCH] * Fix block delete. --- module/block/js/dashboard.js | 2 +- module/testcase/model.php | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/module/block/js/dashboard.js b/module/block/js/dashboard.js index a70869e1e3..f7bd58480b 100644 --- a/module/block/js/dashboard.js +++ b/module/block/js/dashboard.js @@ -18,7 +18,7 @@ function deleteBlock(index) } else { - $('#block' + index).remove(); + window.location.reload(true); } }); } diff --git a/module/testcase/model.php b/module/testcase/model.php index 13006067a3..74cc3e397e 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -672,7 +672,13 @@ class testcaseModel extends model { $parentStepID = 0; $isLibCase = ($oldCase->lib and empty($oldCase->product)); - if($isLibCase) $this->dao->update(TABLE_CASE)->set('`fromCaseVersion`')->eq($version)->where('`fromCaseID`')->eq($caseID)->exec(); + if($isLibCase) + { + $fromcaseVersion = $this->dao->select('fromCaseVersion')->from(TABLE_CASE)->where('fromCaseID')->eq($caseID)->fetch('fromCaseVersion'); + $fromcaseVersion += 1; + $this->dao->update(TABLE_CASE)->set('`fromCaseVersion`')->eq($fromcaseVersion)->where('`fromCaseID`')->eq($caseID)->exec(); + } + foreach($this->post->steps as $stepID => $stepDesc) { if(empty($stepDesc)) continue;