diff --git a/module/zahost/control.php b/module/zahost/control.php index c6b80f992a..e375fd1c07 100644 --- a/module/zahost/control.php +++ b/module/zahost/control.php @@ -118,7 +118,7 @@ class zahost extends control { if($confirm == 'no') { - die(js::confirm($this->lang->zahost->confirmDelete, inlink('delete', "assetID=$assetID&confirm=yes"))); + return print(js::confirm($this->lang->zahost->confirmDelete, inlink('delete', "assetID=$assetID&confirm=yes"))); } $this->dao->update(TABLE_ASSET)->set('deleted')->eq(1)->where('id')->eq($assetID)->exec(); @@ -140,8 +140,8 @@ class zahost extends control $this->send($response); } - if(isonlybody())die(js::reload('parent.parent')); - die(js::locate($this->createLink('zahost', 'browse'), 'parent')); + if(isonlybody()) return print(js::reload('parent.parent')); + return print(js::locate($this->createLink('zahost', 'browse'), 'parent')); } /** @@ -210,7 +210,7 @@ class zahost extends control { if($confirm == 'no') { - die(js::confirm($this->lang->zahost->confirmDelete, inlink('deleteTemplate', "templateID=$templateID&confirm=yes"))); + return print(js::confirm($this->lang->zahost->confirmDeleteVMTemplate, inlink('deleteTemplate', "templateID=$templateID&confirm=yes"))); } $template = $this->zahost->getTemplateById($templateID); @@ -233,8 +233,8 @@ class zahost extends control $this->send($response); } - if(isonlybody())die(js::reload('parent.parent')); - die(js::locate($this->createLink('zahost', 'browsetemplate', "hostID={$template->hostID}"), 'parent')); + if(isonlybody()) return print(js::reload('parent.parent')); + return print(js::locate($this->createLink('zahost', 'browsetemplate', "hostID={$template->hostID}"), 'parent')); } /* diff --git a/module/zahost/lang/de.php b/module/zahost/lang/de.php index 193696d429..b37b2f3183 100644 --- a/module/zahost/lang/de.php +++ b/module/zahost/lang/de.php @@ -70,7 +70,8 @@ $lang->zahost->unitList['TB'] = 'TB'; $lang->zahost->zaHostType = 'Type'; $lang->zahost->zaHostTypeList['physical'] = 'Physical'; -$lang->zahost->confirmDelete = 'Do you want to delete this host?'; +$lang->zahost->confirmDelete = 'Do you want to delete this host?'; +$lang->zahost->confirmDeleteVMTemplate = 'Do you want to delete this VM template?'; $lang->zahost->versionList = array(); $lang->zahost->versionList['winxp']['all'] = 'Windows XP'; diff --git a/module/zahost/lang/en.php b/module/zahost/lang/en.php index 193696d429..b37b2f3183 100644 --- a/module/zahost/lang/en.php +++ b/module/zahost/lang/en.php @@ -70,7 +70,8 @@ $lang->zahost->unitList['TB'] = 'TB'; $lang->zahost->zaHostType = 'Type'; $lang->zahost->zaHostTypeList['physical'] = 'Physical'; -$lang->zahost->confirmDelete = 'Do you want to delete this host?'; +$lang->zahost->confirmDelete = 'Do you want to delete this host?'; +$lang->zahost->confirmDeleteVMTemplate = 'Do you want to delete this VM template?'; $lang->zahost->versionList = array(); $lang->zahost->versionList['winxp']['all'] = 'Windows XP'; diff --git a/module/zahost/lang/fr.php b/module/zahost/lang/fr.php index 79e39d06cb..b7e7aec83d 100644 --- a/module/zahost/lang/fr.php +++ b/module/zahost/lang/fr.php @@ -70,7 +70,8 @@ $lang->zahost->unitList['TB'] = 'TB'; $lang->zahost->zaHostType = 'Type Hôte'; $lang->zahost->zaHostTypeList['physical'] = 'Physique'; -$lang->zahost->confirmDelete = 'Voulez-vous supprimer cet hôte?'; +$lang->zahost->confirmDelete = 'Voulez-vous supprimer cet hôte?'; +$lang->zahost->confirmDeleteVMTemplate = 'Do you want to delete this VM template?'; $lang->zahost->versionList = array(); $lang->zahost->versionList['winxp']['all'] = 'Windows XP'; diff --git a/module/zahost/lang/vi.php b/module/zahost/lang/vi.php index c5a54a5643..c3d3b78464 100644 --- a/module/zahost/lang/vi.php +++ b/module/zahost/lang/vi.php @@ -70,7 +70,8 @@ $lang->zahost->unitList['TB'] = 'TB'; $lang->zahost->zaHostType = 'Type'; $lang->zahost->zaHostTypeList['physical'] = 'Physical'; -$lang->zahost->confirmDelete = 'Do you want to delete this host?'; +$lang->zahost->confirmDelete = 'Do you want to delete this host?'; +$lang->zahost->confirmDeleteVMTemplate = 'Do you want to delete this VM template?'; $lang->zahost->versionList = array(); $lang->zahost->versionList['winxp']['all'] = 'Windows XP'; diff --git a/module/zahost/lang/zh-cn.php b/module/zahost/lang/zh-cn.php index 18fef58d96..1a3c7fb169 100644 --- a/module/zahost/lang/zh-cn.php +++ b/module/zahost/lang/zh-cn.php @@ -70,7 +70,8 @@ $lang->zahost->unitList['TB'] = 'TB'; $lang->zahost->zaHostType = '主机类型'; $lang->zahost->zaHostTypeList['physical'] = '实体主机'; -$lang->zahost->confirmDelete = '是否删除该主机记录?'; +$lang->zahost->confirmDelete = '是否删除该主机记录?'; +$lang->zahost->confirmDeleteVMTemplate = '是否删除该虚拟机模板?'; $lang->zahost->versionList = array(); $lang->zahost->versionList['winxp']['all'] = 'Windows XP';