From eb1624bc48bf2a34c5ccbad5c9bd2189674611ad Mon Sep 17 00:00:00 2001
From: liugang <liugang@easycorp.ltd>
Date: Mon, 4 Sep 2023 13:37:40 +0800
Subject: [PATCH] Revert "* testcase: rename method buildCaseForCase to
 buildCaseForCreate."

This reverts commit e836b9fd1cf0c2ae815abac4d32c5e09860cc51e.
---
 module/testcase/control.php | 41 ++++++++++++++++++++++---------------
 module/testcase/zen.php     |  2 +-
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/module/testcase/control.php b/module/testcase/control.php
index bb785deb96..e9e4a289d3 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -241,7 +241,7 @@ class testcase extends control
         {
             /* 构建用例。 */
             /* Build Case. */
-            $case = $this->testcaseZen->buildCaseForCreate($from, $param);
+            $case = $this->testcaseZen->buildCaseForCase($from, $param);
 
             /* 创建测试用例前检验表单数据是否正确。 */
             /* Check from data for create case. */
@@ -1528,28 +1528,35 @@ class testcase extends control
      */
     public function deleteScene($sceneID, $confirm = 'no')
     {
-        $scene = $this->testcase->getSceneByID($sceneID);
-        $count = $this->dao->select('COUNT(*) AS count')->from(TABLE_SCENE)->where('deleted')->eq('0')->andWhere('parent')->eq($sceneID)->fetch('count');
-        if($count)
-        {
-            if($confirm != 'yes')
-            {
-                $confirmURL = inlink('deleteScene', "sceneID={$sceneID}&confirm=yes");
-                return $this->send(array('result' => 'fail', 'callback' => "zui.Modal.confirm({message: '{$this->lang->testcase->hasChildren}', icon: 'icon-exclamation-sign', iconClass: 'warning-pale rounded-full icon-2x'}).then((res) => {if(res) $.ajaxSubmit({url: '$confirmURL'});});"));
-            }
+        $scene = $this->dao->select('*')->from(VIEW_SCENECASE)->where('id')->eq($sceneID)->andWhere('isCase')->eq(2)->fetch();
 
-            $this->loadModel('action');
-            $scenes = $this->dao->select('id')->from(TABLE_SCENE)->where('deleted')->eq('0')->andWhere('path')->like($scene->path . '%')->fetchPairs();
-            $this->dao->update(TABLE_SCENE)->set('deleted')->eq('1')->where('deleted')->eq(0)->andWhere('path')->like($scene->path . '%')->exec();
-            foreach($scenes as $sceneID) $this->action->create('scene', $sceneID, 'deleted', '', $extra = ACTIONMODEL::CAN_UNDELETED);
+        if($confirm == 'no') return print(js::confirm(sprintf($this->lang->testcase->confirmDeleteScene,addslashes($scene->title)), $this->createLink('testcase', 'deleteScene', "sceneID=$sceneID&confirm=yes")));
+
+        $childrenCount = $this->dao->select('count(*) as count')->from(VIEW_SCENECASE)->where('parent')->eq($sceneID)->andWhere('deleted')->eq(0)->fetch('count');
+        if($childrenCount)
+        {
+            if($confirm != "wait") return print(js::confirm(sprintf($this->lang->testcase->hasChildren), $this->createLink('testcase', 'deleteScene', "sceneID=$sceneID&confirm=wait")));
+            $all = $this->dao->select('id,isCase')->from(VIEW_SCENECASE)->where('path')->like($scene->path . '%')->andWhere('deleted')->eq(0)->fetchAll();
+
+            foreach($all as $v)
+            {
+                if($v->isCase == 2)
+                {
+                    $this->testcase->delete(TABLE_SCENE, $v->id - CHANGEVALUE);
+                }
+                else
+                {
+                    $this->testcase->delete(TABLE_CASE, $v->id);
+                }
+            }
         }
         else
         {
-            $this->testcase->delete(TABLE_SCENE, $sceneID);
+
+            $this->testcase->delete(TABLE_SCENE, $sceneID-CHANGEVALUE);
         }
 
-        $locateLink = $this->session->caseList ? $this->session->caseList : inlink('browse', "productID={$scene->product}");
-        return $this->send(array('result' => 'success', 'load' => $locateLink));
+        echo js::reload('parent');
     }
 
     /**
diff --git a/module/testcase/zen.php b/module/testcase/zen.php
index f95de44df7..8c5a67ea8f 100644
--- a/module/testcase/zen.php
+++ b/module/testcase/zen.php
@@ -1112,7 +1112,7 @@ class testcaseZen extends testcase
      * @access protected
      * @return void
      */
-    protected function buildCaseForCreate(string $from, int $param): object
+    protected function buildCaseForCase(string $from, int $param): object
     {
         $status = $this->getStatusForCreate();