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

* Fix error for task #68706.

Browse Source
This commit is contained in:
liyuchun
2022-09-15 14:39:56 +08:00
parent 18496b20b5
commit 1bb1e5fcd4
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/zahost/config.php
+3
View File
@@ -3,6 +3,9 @@ $config->zahost->create = new stdclass();
$config->zahost->create->requiredFields = 'name,hostType,publicIP,cpuCores,memory,diskSize,virtualSoftware,instanceNum';
$config->zahost->create->ipFields = 'publicIP';
$config->zahost->edit = new stdclass();
$config->zahost->edit->requiredFields = 'name,hostType,cpuCores,memory,diskSize,virtualSoftware,instanceNum';
$config->zahost->createTemplate = new stdclass();
$config->zahost->createTemplate->requiredFields = 'name,cpuCoreNum,memorySize,diskSize,osCategory,osType,osVersion,osLang';
module/zahost/model.php
+5 -3
View File
@@ -87,13 +87,12 @@ class zahostModel extends model
$oldHost = $this->getById($hostID);
$hostInfo = fixer::input('post')->get();
$this->dao->update(TABLE_HOST)->data($hostInfo)
$this->dao->update(TABLE_ZAHOST)->data($hostInfo)
->batchCheck($this->config->zahost->create->requiredFields, 'notempty')
->batchCheck('diskSize,memory', 'float');
if(dao::isError()) return false;
$assetInfo['name'] = $hostInfo->name;
$assetInfo['group'] = $hostInfo->group;
$assetInfo['editedBy'] = $this->app->user->account;
$assetInfo['editedDate'] = helper::now();
@@ -103,7 +102,10 @@ class zahostModel extends model
->exec();
if(dao::isError()) return false;
$this->dao->update(TABLE_HOST)->data($hostInfo, 'name')->autoCheck()->where('id')->eq($hostID)->exec();
$this->dao->update(TABLE_HOST)->data($hostInfo, 'name')->autoCheck()
->batchCheck('cpuCores,diskSize,instanceNum', 'gt', 0)
->batchCheck('diskSize,memory', 'float')
->where('id')->eq($hostID)->exec();
return common::createChanges($oldHost, $hostInfo);
}