diff --git a/module/zahost/css/browse.css b/module/zahost/css/browse.css index 299428cebc..f5ba6cad6d 100644 --- a/module/zahost/css/browse.css +++ b/module/zahost/css/browse.css @@ -1,4 +1,4 @@ -.c-ip {width: 100px;} +.c-ip {width: 180px;} .c-memory, .c-diskSize, .c-status, .c-cpu, .c-software, .c-instanceNum {width: 90px;} .c-datetime {width: 150px;} .status-wait {color: #f00;} diff --git a/module/zanode/control.php b/module/zanode/control.php index 20d99ee485..ad20ecd680 100644 --- a/module/zanode/control.php +++ b/module/zanode/control.php @@ -137,7 +137,8 @@ class zanode extends control $this->view->node = $this->zanode->getNodeById($nodeID); $this->view->notice = $this->lang->zanode->init->initSuccessNoticeTitle; $this->view->buttonName = $this->lang->zanode->init->button; - $this->view->modalLink = $this->createLink('zanode', 'browse'); + $productID = $this->session->product ? $this->session->product : 0; + $this->view->modalLink = $this->createLink('testcase', 'browse', "productID={$productID}"); $this->view->closeLink = $this->createLink('zanode', 'browse'); $this->display(); diff --git a/module/zanode/css/browse.css b/module/zanode/css/browse.css index 1665611064..e0a7fdb8a7 100644 --- a/module/zanode/css/browse.css +++ b/module/zanode/css/browse.css @@ -1,4 +1,5 @@ -.c-id {width: 60px;} +.c-id {width: 180px;} +.c-memory{width: 100px;} .c-status {width: 70px;} .c-ip, .c-cpu, .c-host {width: 100px;} .c-os {width: 120px;} diff --git a/module/zanode/lang/de.php b/module/zanode/lang/de.php index 18a1485db4..f896d79f6d 100644 --- a/module/zanode/lang/de.php +++ b/module/zanode/lang/de.php @@ -58,6 +58,7 @@ $lang->zanode->empty = 'ZenAgent Node not found.'; $lang->zanode->runCaseConfirm = 'The system detects the presence of an automation script. Whether to execute?'; $lang->zanode->empty = 'No ZenAgent Node'; +$lang->zanode->createImage = 'Create Image'; $lang->zanode->createImaging = 'Creating'; $lang->zanode->createImageNotice = 'The system will be created based on the current node,This process requires the ZenAgent Node to be shut down. Do you want to continue?'; $lang->zanode->createImageSuccess = 'Successed, You can use this image to create node.'; diff --git a/module/zanode/lang/en.php b/module/zanode/lang/en.php index fdb3f3b345..105475c200 100644 --- a/module/zanode/lang/en.php +++ b/module/zanode/lang/en.php @@ -58,6 +58,7 @@ $lang->zanode->empty = 'No zanode is found'; $lang->zanode->runCaseConfirm = 'The system detects the presence of an automation script. Whether to execute?'; $lang->zanode->empty = 'No ZenAgent Node'; +$lang->zanode->createImage = 'Create Image'; $lang->zanode->createImaging = 'Creating'; $lang->zanode->createImageNotice = 'The system will be created based on the current node,This process requires the ZenAgent Node to be shut down. Do you want to continue?'; $lang->zanode->createImageSuccess = 'Successed, You can use this image to create node.'; diff --git a/module/zanode/lang/fr.php b/module/zanode/lang/fr.php index fdb3f3b345..105475c200 100644 --- a/module/zanode/lang/fr.php +++ b/module/zanode/lang/fr.php @@ -58,6 +58,7 @@ $lang->zanode->empty = 'No zanode is found'; $lang->zanode->runCaseConfirm = 'The system detects the presence of an automation script. Whether to execute?'; $lang->zanode->empty = 'No ZenAgent Node'; +$lang->zanode->createImage = 'Create Image'; $lang->zanode->createImaging = 'Creating'; $lang->zanode->createImageNotice = 'The system will be created based on the current node,This process requires the ZenAgent Node to be shut down. Do you want to continue?'; $lang->zanode->createImageSuccess = 'Successed, You can use this image to create node.'; diff --git a/module/zanode/model.php b/module/zanode/model.php index c9983957ec..cd96f89273 100644 --- a/module/zanode/model.php +++ b/module/zanode/model.php @@ -320,7 +320,7 @@ class zanodemodel extends model $query = str_replace('`hostID`', 't2.`id`', $query); } - return $this->dao->select('t1.*, t1.name as hostName, t2.extranet,t3.osName')->from(TABLE_ZAHOST)->alias('t1') + return $this->dao->select('t1.*, t2.name as hostName, t2.extranet,t3.osName')->from(TABLE_ZAHOST)->alias('t1') ->leftJoin(TABLE_ZAHOST)->alias('t2')->on('t1.parent = t2.id') ->leftJoin(TABLE_IMAGE)->alias('t3')->on('t3.id = t1.image') ->where('t1.deleted')->eq(0) diff --git a/module/zanode/view/browse.html.php b/module/zanode/view/browse.html.php index 3e6c65b5b6..e1e6398209 100644 --- a/module/zanode/view/browse.html.php +++ b/module/zanode/view/browse.html.php @@ -52,11 +52,11 @@ zanode->name); ?> zanode->extranet); ?> zanode->cpuCores); ?> - zanode->memory); ?> + zanode->memory); ?> zanode->diskSize); ?> zanode->osName); ?> zanode->status); ?> - zanode->hostName); ?> + zanode->hostName); ?> actions ?>