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

* Fix bugs.

Browse Source
This commit is contained in:
zhaoke
2022-12-14 06:44:24 +00:00
parent 05f427f8aa
commit 520fcdb38a
8 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/zahost/css/browse.css
+1 -1
View File
@@ -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;}
module/zanode/control.php
+2 -1
View File
@@ -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();
module/zanode/css/browse.css
+2 -1
View File
@@ -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;}
module/zanode/lang/de.php
+1
View File
@@ -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.';
module/zanode/lang/en.php
+1
View File
@@ -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.';
module/zanode/lang/fr.php
+1
View File
@@ -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.';
module/zanode/model.php
+1 -1
View File
@@ -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)
module/zanode/view/browse.html.php
+2 -2
View File
@@ -52,11 +52,11 @@
<th class='c-name'><?php common::printOrderLink('t1.name', $orderBy, $vars, $lang->zanode->name); ?></th>
<th class='c-ip'><?php common::printOrderLink('t1.extranet', $orderBy, $vars, $lang->zanode->extranet); ?></th>
<th class='c-cpu'><?php common::printOrderLink('t1.cpuCores', $orderBy, $vars, $lang->zanode->cpuCores); ?></th>
<th class='c-number'><?php common::printOrderLink('t1.memory', $orderBy, $vars, $lang->zanode->memory); ?></th>
<th class='c-memory'><?php common::printOrderLink('t1.memory', $orderBy, $vars, $lang->zanode->memory); ?></th>
<th class='c-number'><?php common::printOrderLink('t1.diskSize', $orderBy, $vars, $lang->zanode->diskSize); ?></th>
<th class='c-os'><?php common::printOrderLink('t1.osName', $orderBy, $vars, $lang->zanode->osName); ?></th>
<th class='c-status'><?php common::printOrderLink('t1.status', $orderBy, $vars, $lang->zanode->status); ?></th>
<th class='c-host'><?php common::printOrderLink('t2.id', $orderBy, $vars, $lang->zanode->hostName); ?>
<th class='c-host'><?php common::printOrderLink('t2.name', $orderBy, $vars, $lang->zanode->hostName); ?>
<th class='c-actions-7 text-center'><?php echo $lang->actions ?></th>
</tr>
</thead>