diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index f3730d43a2..8d560f6195 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -227,10 +227,11 @@ $lang->action->desc->reopen = '$date, 由 $actor $lang->action->desc->merged = '$date, 由 $actor 合并。' . "\n"; $lang->action->desc->submitreview = '$date, 由 $actor 提交评审。' . "\n"; $lang->action->desc->ganttmove = '$date, 由 $actor 排序。' . "\n"; -$lang->action->desc->suspend = '$date, 由 $actor 暂停。' . "\n"; +$lang->action->desc->suspend = '$date, 由 $actor 休眠。' . "\n"; $lang->action->desc->resume = '$date, 由 $actor 恢复。' . "\n"; $lang->action->desc->reboot = '$date, 由 $actor 重启。' . "\n"; -$lang->action->desc->destroy = '$date, 由 $actor 销毁。' . "\n"; +$lang->action->desc->destroy = '$date, 由 $actor 关闭。' . "\n"; +$lang->action->desc->boot = '$date, 由 $actor 启动。' . "\n"; $lang->action->desc->relieved = '$date, 由 $actor 解除孪生需求关系。' . "\n"; $lang->action->desc->switchtolight = '$date, 由于 '. $lang->admin->system .' 从全生命周期管理模式切换为轻量管理模式,项目访问控制由项目集内公开调整为私有。' . "\n"; $lang->action->desc->getvnc = '$date, $actor对执行节点 $extra 进行了远程操控。' . "\n"; @@ -405,10 +406,10 @@ $lang->action->label->tolib = '导入了'; $lang->action->label->updatetolib = '更新了'; $lang->action->label->ganttmove = '排序了'; $lang->action->label->submitreview = '提交了评审'; -$lang->action->label->suspend = '暂停了'; +$lang->action->label->suspend = '休眠了'; $lang->action->label->resume = '恢复了'; $lang->action->label->reboot = '重启了'; -$lang->action->label->destroy = '销毁了'; +$lang->action->label->destroy = '关闭了'; $lang->action->label->getvnc = '远程操控'; $lang->action->label->synctwins = '同步修改了'; $lang->action->label->relieved = '解除了'; @@ -647,10 +648,11 @@ $lang->action->dynamicAction->caselib['hidden'] = '隐藏用例库'; $lang->action->dynamicAction->zahost['created'] = '创建宿主机'; $lang->action->dynamicAction->zanode['created'] = '创建执行节点'; -$lang->action->dynamicAction->zanode['suspend'] = '暂停执行节点'; +$lang->action->dynamicAction->zanode['suspend'] = '休眠执行节点'; $lang->action->dynamicAction->zanode['resume'] = '恢复执行节点'; $lang->action->dynamicAction->zanode['reboot'] = '重启执行节点'; -$lang->action->dynamicAction->zanode['destroy'] = '销毁执行节点'; +$lang->action->dynamicAction->zanode['boot'] = '启动执行节点'; +$lang->action->dynamicAction->zanode['destroy'] = '关闭执行节点'; $lang->action->dynamicAction->doclib['created'] = '创建文档库'; $lang->action->dynamicAction->doclib['edited'] = '编辑文档库'; diff --git a/module/zanode/js/common.js b/module/zanode/js/common.js index a9b33c5f1c..80f22268ea 100644 --- a/module/zanode/js/common.js +++ b/module/zanode/js/common.js @@ -18,7 +18,7 @@ $(function() } }); - if(hostID) $('#parent').change(); + if(typeof(hostID) != "undefined" && hostID) $('#parent').change(); $(document).on("change", '#image', function() { var image = $('#image').val(); diff --git a/module/zanode/lang/zh-cn.php b/module/zanode/lang/zh-cn.php index 1c267d5f67..d305128e0c 100644 --- a/module/zanode/lang/zh-cn.php +++ b/module/zanode/lang/zh-cn.php @@ -90,7 +90,7 @@ $lang->zanode->statusList['created'] = '已创建'; $lang->zanode->statusList['launch'] = '运行中'; $lang->zanode->statusList['ready'] = '运行中'; $lang->zanode->statusList['running'] = '运行中'; -$lang->zanode->statusList['suspend'] = '暂停'; +$lang->zanode->statusList['suspend'] = '休眠'; $lang->zanode->statusList['offline'] = '下线'; $lang->zanode->statusList['destroy'] = '已销毁'; $lang->zanode->statusList['shutoff'] = '已关机'; @@ -112,9 +112,9 @@ $lang->zanode->init->ready = "已就绪"; $lang->zanode->init->next = "下一步"; $lang->zanode->init->button = "去设置"; -$lang->zanode->init->initSuccessNoticeTitle = "服务已就绪,还需两步即可在执行节点上执行自动化测试:1、根据%s配置自动化测试运行环境。
2、进行%s"; +$lang->zanode->init->initSuccessNoticeTitle = "服务已就绪,还需两步即可在执行节点上执行自动化测试:
1、根据%s配置自动化测试运行环境。
2、进行%s"; $lang->zanode->init->initFailNoticeTitle = "初始化失败,请查看初始化脚本执行日志并尝试以下两种解决方案:"; -$lang->zanode->init->initFailNoticeDesc = "1. 重新执行脚本
2. 查看初始化常见问题"; +$lang->zanode->init->initFailNoticeDesc = "1、 重新执行脚本
2、 查看初始化常见问题"; $lang->zanode->init->serviceStatus = [ "ZenAgent" => 'not_install', diff --git a/module/zanode/model.php b/module/zanode/model.php index 6254a98947..8e752fbdd8 100644 --- a/module/zanode/model.php +++ b/module/zanode/model.php @@ -212,7 +212,7 @@ class zanodemodel extends model /* delete ZenAgent Node. */ $this->dao->delete()->from(TABLE_ZAHOST)->where('id')->eq($id)->exec();; - $this->loadModel('action')->create('zanode', $id, 'destroy'); + $this->loadModel('action')->create('zanode', $id, 'deleted'); return; } diff --git a/module/zanode/view/browse.html.php b/module/zanode/view/browse.html.php index 185cf81340..24d0c10ec0 100644 --- a/module/zanode/view/browse.html.php +++ b/module/zanode/view/browse.html.php @@ -109,7 +109,6 @@ echo ""; echo ""; echo ""; diff --git a/module/zanode/view/view.html.php b/module/zanode/view/view.html.php index 399173347b..5bcb0cf1bf 100644 --- a/module/zanode/view/view.html.php +++ b/module/zanode/view/view.html.php @@ -186,7 +186,7 @@ $account = strpos($zanode->osName, "windows") ? $config->zanode->defaultWinAccou
- zanode->init->initSuccessNoticeTitle, "{$lang->zanode->manual}", html::a(helper::createLink('testcase', 'automation', "", '', true), $lang->zanode->automation, '', "class='iframe' title='{$lang->zanode->automation}' data-width='50%'", '')); ?> + zanode->init->initSuccessNoticeTitle, "{$lang->zanode->manual}", html::a(helper::createLink('testcase', 'automation', "", '', true), $lang->zanode->automation, '', "class='iframe' title='{$lang->zanode->automation}' data-width='50%'", '')); ?> zanode->init->initFailNoticeTitle . '
' . $lang->zanode->init->initFailNoticeDesc;?>