From 1bb1e5fcd428603fbb5cea851adf19998c1bb4ea Mon Sep 17 00:00:00 2001 From: liyuchun <563917701@qq.com> Date: Thu, 15 Sep 2022 14:39:56 +0800 Subject: [PATCH] * Fix error for task #68706. --- module/zahost/config.php | 3 +++ module/zahost/model.php | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/module/zahost/config.php b/module/zahost/config.php index 56f0744e05..5755820bf8 100644 --- a/module/zahost/config.php +++ b/module/zahost/config.php @@ -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'; diff --git a/module/zahost/model.php b/module/zahost/model.php index 3110c3a2f0..c77216e743 100644 --- a/module/zahost/model.php +++ b/module/zahost/model.php @@ -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); }