From db114d1c39ab6f807777f088648ad4bbdccd22fd Mon Sep 17 00:00:00 2001 From: zhaoke Date: Thu, 9 Feb 2023 08:02:50 +0000 Subject: [PATCH] * Fix error for php5.3. --- config/zentaopms.php | 2 +- module/zahost/lang/vi.php | 4 ++-- module/zahost/view/view.html.php | 2 +- module/zanode/control.php | 2 +- module/zanode/view/{list.html.php => nodelist.html.php} | 0 5 files changed, 5 insertions(+), 5 deletions(-) rename module/zanode/view/{list.html.php => nodelist.html.php} (100%) diff --git a/config/zentaopms.php b/config/zentaopms.php index 77f092763d..78d50b8e00 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -227,7 +227,7 @@ $config->openMethods[] = 'doc.createbasicinfo'; $config->openMethods[] = 'project.createguide'; $config->openMethods[] = 'task.editteam'; $config->openMethods[] = 'feedback.mergeproductmodule'; -$config->openMethods[] = 'zanode.list'; +$config->openMethods[] = 'zanode.nodeList'; $config->openModules = array(); $config->openModules[] = 'install'; diff --git a/module/zahost/lang/vi.php b/module/zahost/lang/vi.php index 3db09c4781..f639c0ca5c 100644 --- a/module/zahost/lang/vi.php +++ b/module/zahost/lang/vi.php @@ -58,12 +58,12 @@ $lang->zahost->init->initSuccessNotice = "The initialization was successful, c $lang->zahost->init->initDesc = "Execute the init script on the host: bash <(curl -s -S -L https://pkg.qucheng.com/zenagent/zagent.sh) -k %s
- Click check service status button."; $lang->zahost->init->initFailNoticeDesc = "1. Re-execute the script
2. Review the initialization FAQ"; -$lang->zahost->init->serviceStatus = [ +$lang->zahost->init->serviceStatus = array( "kvm" => 'not_install', "nginx" => 'not_install', "novnc" => 'not_install', "websockify" => 'not_install', -]; +); $lang->zahost->init->title = "Initialize Host"; $lang->zahost->init->descTitle = "Follow these steps to complete the initialization on the host:"; $lang->zahost->init->initDesc = "Execute the init script on the host: bash <(curl -s -S -L https://pkg.qucheng.com/zenagent/zagent.sh) -k "; diff --git a/module/zahost/view/view.html.php b/module/zahost/view/view.html.php index 012ba10e13..3eaf1ef3f8 100644 --- a/module/zahost/view/view.html.php +++ b/module/zahost/view/view.html.php @@ -138,7 +138,7 @@
zahost->browseNode;?>
- createLink('zanode', 'list', "hostID=$zahost->id", '', true) . "' frameborder='no' allowfullscreen='true' mozallowfullscreen='true' webkitallowfullscreen='true' allowtransparency='true' scrolling='auto' onload='setIframeHeight(this)' style='min-height:300px;'>";?> + createLink('zanode', 'nodeList', "hostID=$zahost->id", '', true) . "' frameborder='no' allowfullscreen='true' mozallowfullscreen='true' webkitallowfullscreen='true' allowtransparency='true' scrolling='auto' onload='setIframeHeight(this)' style='min-height:300px;'>";?>
noData;?>
diff --git a/module/zanode/control.php b/module/zanode/control.php index ef0141ded4..835d3a8465 100644 --- a/module/zanode/control.php +++ b/module/zanode/control.php @@ -76,7 +76,7 @@ class zanode extends control * @access public * @return void */ - public function list($hostID, $orderBy = 'id_desc') + public function nodeList($hostID, $orderBy = 'id_desc') { if(!commonModel::hasPriv('zanode', 'browse')) { diff --git a/module/zanode/view/list.html.php b/module/zanode/view/nodelist.html.php similarity index 100% rename from module/zanode/view/list.html.php rename to module/zanode/view/nodelist.html.php