From 7752e5237a7bf0d5e85ce0fa0865d838c2b4b6da Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 23 Apr 2024 15:56:11 +0800
Subject: [PATCH] * Optimize code.

---
 module/testtask/zen.php | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/module/testtask/zen.php b/module/testtask/zen.php
index 54abfe73e8..0eec51a72f 100644
--- a/module/testtask/zen.php
+++ b/module/testtask/zen.php
@@ -657,26 +657,17 @@ class testtaskZen extends testtask
         $automation = $this->loadModel('zanode')->getAutomationByProduct($run->case->product);
         if($run->case->auto == 'auto' && $confirm == '')
         {
-            if(!$automation)
-            {
-                if(helper::isAjaxRequest() && !isInModal()) return $this->send(array('load' => $cancelURL));
-                $this->locate($cancelURL);
-            }
+            if(!$automation) return $this->send(array('load' => $cancelURL));
 
             $confirmURL = inlink('runCase', "runID=$runID&caseID=$caseID&version=$version&confirm=yes");
-            if(helper::isAjaxRequest() && !isInModal()) return $this->send(array('result' => 'fail', 'load' => array('confirm' => $this->lang->zanode->runCaseConfirm, 'confirmed' => $confirmURL, 'canceled' => $cancelURL)));
-            return print(js::start() . "zui.Modal.hide($(document).find('.modal')); zui.Modal.confirm('{$this->lang->zanode->runCaseConfirm}').then((res) => {if(res){ openUrl({url: '{$confirmURL}', load: 'modal', size: 'lg'});}else{ openUrl({url: '{$cancelURL}', load: 'modal', size: 'lg'});}});" . js::end());
+            return $this->send(array('result' => 'fail', 'load' => array('confirm' => $this->lang->zanode->runCaseConfirm, 'confirmed' => $confirmURL, 'canceled' => $cancelURL)));
         }
 
         /* 用户确认后执行自动化测试的相关操作。*/
         /* Perform automated testing related operations after user confirmation. */
         if($confirm == 'yes')
         {
-            if(!$automation)
-            {
-                if(helper::isAjaxRequest() && !isInModal()) return $this->send(array('load' => $cancelURL));
-                $this->locate($cancelURL);
-            }
+            if(!$automation) return $this->send(array('load' => $cancelURL));
             $resultID = $this->testtask->initResultForAutomatedTest($runID, $caseID, $run->case->version, $automation->node);
             if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError(), 'load' => $this->createLink('zanode', 'browse')));