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

* Fix issue.

Browse Source
This commit is contained in:
tanghucheng
2022-12-14 09:12:45 +08:00
parent d2175b728e
commit a0e324bbd5
10 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/lang/de.php
+4
View File
@@ -97,6 +97,10 @@ $lang->testcase->deleted = 'Deleted';
$lang->testcase->browseUnits = 'Unit Test';
$lang->testcase->suite = 'Test Suite';
$lang->testcase->executionStatus = 'executionStatus';
$lang->testcase->caseType = 'Case Type';
$lang->testcase->allType = 'All Types';
$lang->testcase->showAutoCase = 'Show Automated Test Cases';
$lang->testcase->automation = 'Automation Test';
$lang->case = $lang->testcase; // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case.
module/testcase/lang/en.php
+4
View File
@@ -97,6 +97,10 @@ $lang->testcase->deleted = 'Deleted';
$lang->testcase->browseUnits = 'Unit Test';
$lang->testcase->suite = 'Test Suite';
$lang->testcase->executionStatus = 'executionStatus';
$lang->testcase->caseType = 'Case Type';
$lang->testcase->allType = 'All Types';
$lang->testcase->showAutoCase = 'Show Automated Test Cases';
$lang->testcase->automation = 'Automation Test';
$lang->case = $lang->testcase; // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case.
module/testcase/lang/fr.php
+4
View File
@@ -97,6 +97,10 @@ $lang->testcase->deleted = 'Deleted';
$lang->testcase->browseUnits = 'Unit Test';
$lang->testcase->suite = 'Test Suite';
$lang->testcase->executionStatus = 'executionStatus';
$lang->testcase->caseType = 'Case Type';
$lang->testcase->allType = 'All Types';
$lang->testcase->showAutoCase = 'Show Automated Test Cases';
$lang->testcase->automation = 'Automation Test';
$lang->case = $lang->testcase; // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case.
module/testcase/lang/zh-cn.php
+4
View File
@@ -97,6 +97,10 @@ $lang->testcase->deleted = '是否删除';
$lang->testcase->browseUnits = '单元测试';
$lang->testcase->suite = '套件';
$lang->testcase->executionStatus = '执行状态';
$lang->testcase->caseType = '用例类型';
$lang->testcase->allType = '所有类型';
$lang->testcase->showAutoCase = '显示自动化用例';
$lang->testcase->automation = '自动化测试';
$lang->case = $lang->testcase; // 用于DAO检查时使用。因为case是系统关键字，所以无法定义该模块为case，只能使用testcase，但表还是使用的case。
module/testcase/view/caseheader.html.php
+1 -1
View File
@@ -117,7 +117,7 @@
<div class='btn-toolbar pull-right'>
<?php if(!empty($productID)): ?>
<div class='btn-group'>
<?php common::printLink('testcase', 'automation', "productID=$productID", "<i class='icon-testcase muted'> </i>" . $lang->zanode->automation, '', "class='btn btn-link iframe'", true, true)?>
<?php common::printLink('testcase', 'automation', "productID=$productID", "<i class='icon-testcase muted'> </i>" . $lang->testcase->automation, '', "class='btn btn-link iframe'", true, true)?>
</div>
<div class='btn-group'>
<button type='button' class='btn btn-link dropdown-toggle' data-toggle='dropdown'>
module/zanode/control.php
+2 -1
View File
@@ -224,7 +224,7 @@ class zanode extends control
$response['message'] = dao::getError();
return $this->send($response);
}
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'reload'));
}
$this->view->task = $task;
@@ -276,6 +276,7 @@ class zanode extends control
/* Add action log. */
if(!empty($vnc->token)) $this->loadModel('action')->create('zanode', $nodeID, 'getVNC');
$this->view->title = $this->lang->zanode->getVNC;
$this->view->url = $node->ip . ":" . $node->hzap;
$this->view->host = !empty($vnc->hostIP) ? $vnc->hostIP:'';
$this->view->token = !empty($vnc->token) ? $vnc->token:'';
module/zanode/css/browse.css
+1
View File
@@ -3,3 +3,4 @@
.c-ip, .c-cpu, .c-host {width: 100px;}
.c-os {width: 120px;}
.c-actions-7{width: 205px;}
.createImage{margin-right: 4px;}
module/zanode/lang/zh-cn.php
+7 -7
View File
@@ -16,7 +16,7 @@ $lang->zanode->all = '全部';
$lang->zanode->byQuery = '搜索';
$lang->zanode->osName = '操作系统';
$lang->zanode->image = '镜像';
$lang->zanode->imageName = '镜像名称';
$lang->zanode->imageName = '快照名称';
$lang->zanode->name = '名称';
$lang->zanode->start = '创建后自动开启';
$lang->zanode->hostName = '所属宿主机';
@@ -57,11 +57,11 @@ $lang->zanode->nameValid = "名称只能是字母、数字，'-'，'_'，'.
$lang->zanode->empty = '暂时没有执行节点';
$lang->zanode->runCaseConfirm = '系统检测到选择的用例存在自动化测试脚本，是否自动执行用例？';
$lang->zanode->createImage = '创建镜像';
$lang->zanode->createImaging = '正在创建镜像';
$lang->zanode->createImageNotice = '系统将基于当前执行节点创建镜像，该过程需要关闭该执行节点，确定要继续么？';
$lang->zanode->createImageSuccess = '镜像创建成功，您可以使用此镜像创建执行节点。';
$lang->zanode->createImageFail = '镜像创建失败';
$lang->zanode->createImage = '创建快照';
$lang->zanode->createImaging = '正在创建快照';
$lang->zanode->createImageNotice = '系统将基于当前执行节点创建快照，该过程需要关闭该执行节点，确定要继续么？';
$lang->zanode->createImageSuccess = '快照创建成功，您可以使用此快照创建执行节点。';
$lang->zanode->createImageFail = '快照创建失败';
$lang->zanode->createImageButton = '去创建';
$lang->zanode->imageNameEmpty = '名称不能为空';
@@ -102,4 +102,4 @@ $lang->zanode->init->serviceStatus = [
];
$lang->zanode->init->title = "初始化执行节点";
$lang->zanode->init->descTitle = "请根据引导完成执行节点上的初始化: ";
$lang->zanode->init->initDesc = "- 在执行节点上执行命令：curl -sSL https://pkg.qucheng.com/zenagent/zagent.sh | bash /dev/stdin -szvm -z%s <br>- 点击检测服务状态。";$lang->zanode->init->statusTitle = "服务状态";
$lang->zanode->init->initDesc = "- 在执行节点上执行命令：curl -sSL https://pkg.qucheng.com/zenagent/zagent.sh | bash /dev/stdin -szvm -z%s <br>- 点击检测服务状态。";$lang->zanode->init->statusTitle = "服务状态";
module/zanode/view/browse.html.php
+2 -2
View File
@@ -92,8 +92,8 @@
common::printLink('zanode', 'suspend', "zanodeID={$node->id}", "<i class='icon icon-pause'></i> ", '', $suspendAttr);
}
common::printLink('zanode', 'reboot', "zanodeID={$node->id}", "<i class='icon icon-restart'></i> ", '', $rebootAttr);
common::printLink('zanode', 'getVNC', "id={$node->id}", "<i class='icon icon-desktop'></i> ", '', "title='{$lang->zanode->getVNC}' class='btn " . ($node->status == 'running' ? '':'disabled') . "'", '');
common::printLink('zanode', 'createImage', "zanodeID={$node->id}", "<i class='icon icon-plus'></i> ", '', "class='btn iframe' title='{$lang->zanode->createImage}' data-width='50%'", '', true);
common::printLink('zanode', 'getVNC', "id={$node->id}", "<i class='icon icon-desktop'></i> ", '_blank', "title='{$lang->zanode->getVNC}' class='btn " . ($node->status == 'running' ? '':'disabled') . "'", '');
common::printLink('zanode', 'createImage', "zanodeID={$node->id}", "<i class='icon icon-plus'></i> ", '', "class='btn iframe createImage' title='{$lang->zanode->createImage}' data-width='50%'", '', true);
common::printIcon('zanode', 'edit', "id={$node->id}", $node, 'list');
common::printLink('zanode', 'delete', "zanodeID={$node->id}", "<i class='icon icon-trash'></i> ", '', "title='{$lang->zanode->destroy}' class='btn btn-primary' target='hiddenwin' onclick='if(confirm(\"{$lang->zanode->confirmDelete}\")==false) return false;'");
common::printIcon('zanode', 'init', "hostID={$node->id}", $node, 'list', 'refresh', '', ' init', false, "data-placement='bottom'", $lang->zanode->init->title);
module/zanode/view/view.html.php
+1 -1
View File
@@ -116,7 +116,7 @@
{
common::printLink('zanode', 'resume', "id={$zanode->id}", "<i class='icon icon-restart'></i> " . $lang->zanode->resume, '', "title='{$lang->zanode->resume}' class='btn' target='hiddenwin' onclick='if(confirm(\"{$lang->zanode->confirmResume}\")==false) return false;'");
}
common::printLink('zanode', 'getVNC', "id={$zanode->id}", "<i class='icon icon-desktop'></i> " . $lang->zanode->getVNC, '', "title='{$lang->zanode->getVNC}' class='btn iframe " . (common::hasPriv('zanode', 'getVNC') && $zanode->status == 'running' ? '':'disabled') . "'", '', true);
common::printLink('zanode', 'getVNC', "id={$zanode->id}", "<i class='icon icon-desktop'></i> " . $lang->zanode->getVNC, '_blank', "title='{$lang->zanode->getVNC}' class='btn " . (common::hasPriv('zanode', 'getVNC') && $zanode->status == 'running' ? '':'disabled') . "'");
}
?>
<div class='divider'></div>