From f529ca6cb1991f151e0a448eb70842b830c973e1 Mon Sep 17 00:00:00 2001 From: daitingting Date: Tue, 26 Dec 2023 02:30:47 +0000 Subject: [PATCH] * Refactor update function. --- module/zahost/model.php | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/module/zahost/model.php b/module/zahost/model.php index f82a6da59f..45af793e5d 100644 --- a/module/zahost/model.php +++ b/module/zahost/model.php @@ -52,35 +52,27 @@ class zahostModel extends model } /** + * 更新宿主机。 * Update a host. * - * @param int $hostID + * @param object $hostInfo * @access public * @return array|bool */ public function update($hostInfo) { - $oldHost = $this->getById($hostInfo->id); - - $this->dao->update(TABLE_ZAHOST)->data($hostInfo) - ->batchCheck($this->config->zahost->create->requiredFields, 'notempty') - ->batchCheck('diskSize,memory', 'float') - ->check('name', 'unique', "id != $hostInfo->id and type in ('vhost', 'zahost')") - ->autoCheck(); - - if(dao::isError()) return false; - $ping = $this->checkAddress($hostInfo->extranet); - - if(!$ping) - { - return false; - } + if(!$ping) dao::$errors['extranet'][] = $this->lang->zahost->netError; $this->dao->update(TABLE_ZAHOST)->data($hostInfo)->autoCheck() + ->batchCheck($this->config->zahost->create->requiredFields, 'notempty') ->batchCheck('cpuCores,diskSize', 'gt', 0) ->batchCheck('diskSize,memory', 'float') - ->where('id')->eq($hostInfo->id)->exec(); + ->check('name', 'unique', "id != $hostInfo->id and type in ('vhost', 'zahost')") + ->where('id')->eq($hostInfo->id) + ->exec(); + + $oldHost = $this->getByID($hostInfo->id); return common::createChanges($oldHost, $hostInfo); }