diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index f5f43fd1ab..db38875d5f 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1236,6 +1236,7 @@ $lang->zahost->methodOrder[25] = 'browseImage'; $lang->resource->zanode = new stdclass(); $lang->resource->zanode->browse = 'browse'; $lang->resource->zanode->create = 'create'; +$lang->resource->zanode->edit = 'edit'; $lang->resource->zanode->destroy = 'destroy'; $lang->resource->zanode->reboot = 'reboot'; $lang->resource->zanode->suspend = 'suspend'; @@ -1246,8 +1247,9 @@ $lang->resource->zanode->close = 'shutdown'; $lang->resource->zanode->view = 'view'; $lang->resource->zanode->createImage = 'createImage'; -$lang->zanode->methodOrder[5] = 'browse'; -$lang->zanode->methodOrder[10] = 'create'; +$lang->zanode->methodOrder[0] = 'browse'; +$lang->zanode->methodOrder[5] = 'create'; +$lang->zanode->methodOrder[10] = 'edit'; $lang->zanode->methodOrder[15] = 'destroy'; $lang->zanode->methodOrder[20] = 'reboot'; $lang->zanode->methodOrder[35] = 'suspend'; diff --git a/module/zanode/control.php b/module/zanode/control.php index f4a21cc6af..b90c0a2194 100644 --- a/module/zanode/control.php +++ b/module/zanode/control.php @@ -281,7 +281,7 @@ class zanode extends control * @param int $nodeID * @return void */ - public function delete($nodeID, $confirm = 'no') + public function destroy($nodeID, $confirm = 'no') { if($confirm == 'no') { diff --git a/module/zanode/lang/de.php b/module/zanode/lang/de.php index 4fbaf3e9b4..dc3c75f7a6 100644 --- a/module/zanode/lang/de.php +++ b/module/zanode/lang/de.php @@ -2,6 +2,7 @@ $lang->zanode->common = 'ZenAgent Node'; $lang->zanode->browse = 'ZenAgent Node List'; $lang->zanode->create = 'Create ZenAgent Node'; +$lang->zanode->edit = 'Edit ZenAgent Node'; $lang->zanode->editAction = 'Edit ZenAgent Node'; $lang->zanode->view = 'View ZenAgent Node'; $lang->zanode->initTitle = 'Init ZenAgent Node'; diff --git a/module/zanode/lang/en.php b/module/zanode/lang/en.php index 05eb05ab04..11b15f155d 100644 --- a/module/zanode/lang/en.php +++ b/module/zanode/lang/en.php @@ -2,6 +2,7 @@ $lang->zanode->common = 'ZenAgent Node'; $lang->zanode->browse = 'ZenAgent Node List'; $lang->zanode->create = 'Create ZenAgent Node'; +$lang->zanode->edit = 'Edit ZenAgent Node'; $lang->zanode->editAction = 'Edit ZenAgent Node'; $lang->zanode->view = 'View ZenAgent Node'; $lang->zanode->initTitle = 'Init ZenAgent Node'; diff --git a/module/zanode/lang/fr.php b/module/zanode/lang/fr.php index 6402124550..8815f579f9 100644 --- a/module/zanode/lang/fr.php +++ b/module/zanode/lang/fr.php @@ -2,6 +2,7 @@ $lang->zanode->common = 'ZenAgent Node'; $lang->zanode->browse = 'ZenAgent Node List'; $lang->zanode->create = 'Create ZenAgent Node'; +$lang->zanode->edit = 'Edit ZenAgent Node'; $lang->zanode->editAction = 'Edit ZenAgent Node'; $lang->zanode->view = 'View ZenAgent Node'; $lang->zanode->initTitle = 'Init ZenAgent Node'; diff --git a/module/zanode/lang/zh-cn.php b/module/zanode/lang/zh-cn.php index 3f6bfc8f36..773b0c7133 100644 --- a/module/zanode/lang/zh-cn.php +++ b/module/zanode/lang/zh-cn.php @@ -2,6 +2,7 @@ $lang->zanode->common = '执行节点'; $lang->zanode->browse = '执行节点列表'; $lang->zanode->create = '创建执行节点'; +$lang->zanode->edit = '编辑执行节点'; $lang->zanode->editAction = '编辑执行节点'; $lang->zanode->view = '执行节点详情'; $lang->zanode->initTitle = '初始化执行节点'; diff --git a/module/zanode/model.php b/module/zanode/model.php index 8e752fbdd8..7e03759651 100644 --- a/module/zanode/model.php +++ b/module/zanode/model.php @@ -681,7 +681,7 @@ class zanodemodel extends model $params = "id=$node->id"; $menu .= $this->buildMenu('zanode', 'edit', $params, $node, 'view'); - $menu .= $this->buildMenu('zanode', 'delete', $params, $node, 'view', 'trash', 'hiddenwin'); + $menu .= $this->buildMenu('zanode', 'destroy', $params, $node, 'view', 'trash', 'hiddenwin', '', false, '', ' '); return $menu; } diff --git a/module/zanode/view/browse.html.php b/module/zanode/view/browse.html.php index c8e87bbf7d..263ca2f49f 100644 --- a/module/zanode/view/browse.html.php +++ b/module/zanode/view/browse.html.php @@ -110,7 +110,7 @@ echo ""; echo "
"; echo ""; ?>