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

* Fix bug.

Browse Source
This commit is contained in:
zhaoke
2022-12-21 06:00:29 +00:00
parent 800573c6cb
commit ddeffea161
9 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/lang/de.php
+2 -1
View File
@@ -28,7 +28,8 @@ $lang->testtask->batchAssign = "Mehrere zuordnen";
$lang->testtask->runCase = "Ausführen";
$lang->testtask->running = "Running";
$lang->testtask->runningLog = "Execution Log";
$lang->testtask->runNode = ",Execute on node %s";
$lang->testtask->runningNode = "Executed by %s,Executing on node %s";
$lang->testtask->runNode = "Executed by %s,Execute on node %s";
$lang->testtask->batchRun = "Mehrere ausführen";
$lang->testtask->results = "Ergebnisse";
$lang->testtask->createBug = "Bug erstellen";
module/testtask/lang/en.php
+2 -1
View File
@@ -28,7 +28,8 @@ $lang->testtask->batchAssign = "Batch Assign";
$lang->testtask->runCase = "Run";
$lang->testtask->running = "Running";
$lang->testtask->runningLog = "Execution Log";
$lang->testtask->runNode = ",Execute on node %s";
$lang->testtask->runningNode = "Executed by %s,Executing on node %s";
$lang->testtask->runNode = "Executed by %s,Execute on node %s";
$lang->testtask->batchRun = "Batch Run";
$lang->testtask->results = "Results";
$lang->testtask->createBug = "Bug(+)";
module/testtask/lang/fr.php
+2 -1
View File
@@ -28,7 +28,8 @@ $lang->testtask->batchAssign = "Affecter par Lot";
$lang->testtask->runCase = "Jouer";
$lang->testtask->running = "Running";
$lang->testtask->runningLog = "Execution Log";
$lang->testtask->runNode = ",Execute on node %s";
$lang->testtask->runningNode = "Executed by %s,Executing on node %s";
$lang->testtask->runNode = "Executed by %s,Execute on node %s";
$lang->testtask->batchRun = "Jouer par Lot";
$lang->testtask->results = "Résultats";
$lang->testtask->createBug = "Bug(+)";
module/testtask/lang/vi.php
+2 -1
View File
@@ -29,7 +29,8 @@ $lang->testtask->batchAssign = "Bàn giao hàng loạt";
$lang->testtask->runCase = "Chạy";
$lang->testtask->running = "Running";
$lang->testtask->runningLog = "Execution Log";
$lang->testtask->runNode = ",Execute on node %s";
$lang->testtask->runningNode = "Executed by %s,Executing on node %s";
$lang->testtask->runNode = "Executed by %s,Execute on node %s";
$lang->testtask->batchRun = "Chạy hàng loạt";
$lang->testtask->results = "Kết quả";
$lang->testtask->resultsAction = "Kết quả tình huống";
module/testtask/lang/zh-cn.php
+1
View File
@@ -28,6 +28,7 @@ $lang->testtask->batchAssign = "批量指派";
$lang->testtask->runCase = "执行";
$lang->testtask->running = "执行中";
$lang->testtask->runningLog = "执行日志";
$lang->testtask->runningNode = "由%s，在执行节点%s上执行中";
$lang->testtask->runNode = "由%s，在执行节点%s上执行";
$lang->testtask->batchRun = "批量执行";
$lang->testtask->results = "结果";
module/testtask/lang/zh-tw.php
+2 -1
View File
@@ -28,7 +28,8 @@ $lang->testtask->batchAssign = "批量指派";
$lang->testtask->runCase = "執行";
$lang->testtask->running = "執行中";
$lang->testtask->runningLog = "執行日誌";
$lang->testtask->runNode = "，在執行節點%s上";
$lang->testtask->runningNode = "由%s，在執行節點%s上執行中";
$lang->testtask->runNode = "由%s，在執行節點%s上執行";
$lang->testtask->batchRun = "批量執行";
$lang->testtask->results = "結果";
$lang->testtask->createBug = "提Bug";
module/testtask/view/results.html.php
+1 -1
View File
@@ -46,7 +46,7 @@
<td class='w-120px'> &nbsp; #<?php echo $result->id?></td>
<td class='w-180px'><?php echo $result->date;?></td>
<?php if($result->node > 0):?>
<td><?php echo sprintf($lang->testtask->runNode, zget($users, $result->lastRunner), $result->nodeName) . "&nbsp;&nbsp;<span class=\"label label-badge\">{$lang->testtask->auto}</span>";?></td>
<td><?php echo sprintf(empty($result->ZTFResult) ? $lang->testtask->runningNode : $lang->testtask->runNode, zget($users, $result->lastRunner), $result->nodeName) . "&nbsp;&nbsp;<span class=\"label label-badge\">{$lang->testtask->auto}</span>";?></td>
<?php else:?>
<td><?php echo zget($users, $result->lastRunner) . ' ' . $lang->testtask->runCase;?></td>
<?php endif;?>
module/testtask/view/runcase.html.php
+6 -2
View File
@@ -120,6 +120,10 @@
</div>
<script>
$(function()
{
loadResult();
});
function loadResult()
{
$('#resultsContainer').load("<?php echo $this->createLink('testtask', 'results', "runID={$runID}&caseID=$caseID&version=$version");?> #casesResults", function()
{
@@ -158,13 +162,13 @@ $(function()
if(task.ZTFResult != '')
{
clearInterval(resultInterval);
window.location.reload();
loadResult();
}
});
}, 1000);
}
});
});
}
var sessionString = '<?php echo session_name() . '=' . session_id();?>';
</script>
<?php include '../../common/view/footer.lite.html.php';?>
module/zanode/model.php
+4 -4
View File
@@ -806,8 +806,8 @@ class zanodemodel extends model
if(empty($node) or $node->status != 'running' or !$node->ip or !$node->ztf or !$node->tokenSN)
{
$this->dao->delete()->from(TABLE_TESTRESULT)->where('id')->eq($task)->exec();
return dao::$errors = $this->lang->zanode->runTimeout;
// $this->dao->delete()->from(TABLE_TESTRESULT)->where('id')->eq($task)->exec();
// return dao::$errors = $this->lang->zanode->runTimeout;
}
$params = array(
@@ -820,8 +820,8 @@ class zanodemodel extends model
$result = json_decode(commonModel::http("http://{$node->ip}:{$node->ztf}/api/v1/jobs/add", json_encode($params), array(), array("Authorization:$node->tokenSN")));
if(empty($result) or $result->code != 0)
{
$this->dao->delete()->from(TABLE_TESTRESULT)->where('id')->eq($task)->exec();
return dao::$errors = $this->lang->zanode->runTimeout;
// $this->dao->delete()->from(TABLE_TESTRESULT)->where('id')->eq($task)->exec();
// return dao::$errors = $this->lang->zanode->runTimeout;
}
}
}