Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge remote-tracking branch 'origin/release-20.0'

Browse Source
This commit is contained in:
tianshujie
2024-04-23 17:12:24 +08:00
parent 63d51564de 8856db689c
commit bced2b76b4
191 changed files with 1353 additions and 866 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/js/runcase.ui.js
+2 -2
View File
@@ -4,9 +4,9 @@ $(function()
loadResult();
});
$('#runCaseModal').closest('.modal').on('hide.zui.modal', function()
$('#runCaseModal').closest('.modal').off('hide.zui.modal').on('hide.zui.modal', function()
{
if($('#casesResults').length == 0) loadCurrentPage();
loadCurrentPage();
});
/**
module/testtask/zen.php
+3 -12
View File
@@ -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()) 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()) 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()) 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')));