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

* Fix bug #31437.

Browse Source
This commit is contained in:
tanghucheng
2023-01-05 13:15:59 +08:00
parent bd2bdbefe4
commit 83e8ebf65b
8 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/zahost/view/view.html.php
+1 -2
View File
@@ -18,7 +18,6 @@
<?php $vars = "id={$zahost->hostID}&orderBy=%s";?>
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'>
<?php $browseLink = inLink('browse');?>
<?php echo html::linkButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, $browseLink, 'self', "data-app='{$app->tab}'", 'btn btn-secondary');?>
<div class='divider'></div>
<div class='page-title'>
@@ -171,7 +170,7 @@
<?php $this->printExtendFields($zahost, 'div', "position=left&inForm=0&inCell=1");?>
<div class='main-actions'>
<div class="btn-toolbar">
<?php echo html::backButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', 'btn btn-secondary');?>
<?php echo html::linkButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, $browseLink, 'self', "data-app='{$app->tab}'", 'btn btn-secondary');?>
<div class='divider'></div>
<?php echo $this->zahost->buildOperateMenu($zahost, 'view');?>
</div>
module/zanode/control.php
+3 -1
View File
@@ -233,7 +233,9 @@ class zanode extends control
if($error)
{
return print(js::error($error));
$response['result'] = 'fail';
$response['message'] = $error;
return $this->send($response);
}
else
{
module/zanode/lang/de.php
+1
View File
@@ -83,6 +83,7 @@ $lang->zanode->imageNameEmpty = 'Name can not be empty.';
$lang->zanode->runTimeout = 'Network connection timeout, please check the host and execution node status.';
$lang->zanode->apiError['-10100'] = 'ZenAgent Node not found.';
$lang->zanode->apiError['fail'] = 'Connection timeout, Please check the host and execution node status.';
$lang->zanode->publicList[0] = 'Private';
$lang->zanode->publicList[1] = 'Public';
module/zanode/lang/en.php
+1
View File
@@ -83,6 +83,7 @@ $lang->zanode->imageNameEmpty = 'Name can not be empty.';
$lang->zanode->runTimeout = 'Network connection timeout, please check the host and execution node status.';
$lang->zanode->apiError['-10100'] = 'ZenAgent Node not found.';
$lang->zanode->apiError['fail'] = 'Connection timeout, Please check the host and execution node status.';
$lang->zanode->publicList[0] = 'Private';
$lang->zanode->publicList[1] = 'Public';
module/zanode/lang/fr.php
+1
View File
@@ -83,6 +83,7 @@ $lang->zanode->imageNameEmpty = 'Name can not be empty.';
$lang->zanode->runTimeout = 'Network connection timeout, please check the host and execution node status.';
$lang->zanode->apiError['-10100'] = 'ZenAgent Node not found.';
$lang->zanode->apiError['fail'] = 'Connection timeout, Please check the host and execution node status.';
$lang->zanode->publicList[0] = 'Private';
$lang->zanode->publicList[1] = 'Public';
module/zanode/lang/zh-cn.php
+1
View File
@@ -83,6 +83,7 @@ $lang->zanode->imageNameEmpty = '名称不能为空';
$lang->zanode->runTimeout = '自动执行失败，请检查宿主机和执行节点状态';
$lang->zanode->apiError['-10100'] = '执行节点不存在';
$lang->zanode->apiError['fail'] = '执行失败，请检查宿主机和执行节点状态';
$lang->zanode->publicList[0] = '不共享';
$lang->zanode->publicList[1] = '共享';
module/zanode/view/browse.html.php
+1 -1
View File
@@ -85,7 +85,7 @@
$rebootAttr = "title='{$lang->zanode->reboot}' target='hiddenwin'";
$rebootAttr .= $node->status == 'shutoff' ? ' class="btn disabled"' : "class='btn' target='hiddenwin' onclick='if(confirm(\"{$lang->zanode->confirmReboot}\")==false) return false;'";
common::printLink('zanode', 'getVNC', "id={$node->id}", "<i class='icon icon-remote'></i> ", '_blank', "title='{$lang->zanode->getVNC}' class='btn desktop " . (in_array($node->status ,array('running', 'launch', 'wait')) ? '':'disabled') . "'", '');
common::printLink('zanode', 'getVNC', "id={$node->id}", "<i class='icon icon-remote'></i> ", (in_array($node->status ,array('running', 'launch', 'wait')) ? '_blank' : ''), "title='{$lang->zanode->getVNC}' class='btn desktop " . (in_array($node->status ,array('running', 'launch', 'wait')) ? '':'disabled') . "'", '');
if($node->status == "suspend")
{
common::printLink('zanode', 'resume', "zanodeID={$node->id}", "<i class='icon icon-resume'></i> ", '', $resumeAttr);
module/zanode/view/view.html.php
+1 -2
View File
@@ -28,7 +28,6 @@ $account = strpos($zanode->osName, "windows") ? $config->zanode->defaultWinAccou
?>
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'>
<?php $browseLink = inLink('browse');?>
<?php echo html::linkButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, $browseLink, 'self', "data-app='{$app->tab}'", 'btn btn-secondary');?>
<div class='divider'></div>
<div class='page-title'>
@@ -153,7 +152,7 @@ $account = strpos($zanode->osName, "windows") ? $config->zanode->defaultWinAccou
<?php $this->printExtendFields($zanode, 'div', "position=left&inForm=0&inCell=1"); ?>
<div class='main-actions'>
<div class="btn-toolbar">
<?php echo html::backButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', 'btn btn-secondary'); ?>
<?php echo html::linkButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, $browseLink, 'self', "data-app='{$app->tab}'", 'btn btn-secondary');?>
<div class='divider'></div>
<?php
if (empty($zanode->deleted)) {