From 6fe824347f18791a4344530fdb5bf308850f02de Mon Sep 17 00:00:00 2001 From: dingguodong Date: Wed, 3 Jul 2024 14:10:36 +0800 Subject: [PATCH] * [task#121513] Disk size values can only be increased. --- module/instance/control.php | 6 +++--- module/instance/ui/setting.html.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/instance/control.php b/module/instance/control.php index e87296791f..a21747f537 100644 --- a/module/instance/control.php +++ b/module/instance/control.php @@ -93,8 +93,8 @@ class instance extends control $currentResource = $this->cne->getAppConfig($instance); $diskSettings = $this->cne->getDiskSettings($instance); - $this->lang->instance->errors->invalidDiskSize = sprintf($this->lang->instance->errors->invalidDiskSize, $diskSettings->used, $diskSettings->limit); - $this->lang->instance->tips->resizeDisk = sprintf($this->lang->instance->tips->resizeDisk, $diskSettings->used, $diskSettings->limit); + $this->lang->instance->errors->invalidDiskSize = sprintf($this->lang->instance->errors->invalidDiskSize, $diskSettings->size, $diskSettings->limit); + $this->lang->instance->tips->resizeDisk = sprintf($this->lang->instance->tips->resizeDisk, $diskSettings->size, $diskSettings->limit); if(!empty($_POST)) { @@ -124,7 +124,7 @@ class instance extends control $disk = $newInstance->disk_gb; if(is_numeric($disk) && $disk != $diskSettings->size) { - if($disk < $diskSettings->used || $disk > $diskSettings->limit) return $this->send(array('result' => 'fail', 'message' => $this->lang->instance->errors->invalidDiskSize)); + if($disk < $diskSettings->size || $disk > $diskSettings->limit) return $this->send(array('result' => 'fail', 'message' => $this->lang->instance->errors->invalidDiskSize)); if(!$this->instance->updateVolSize($instance, $disk . 'Gi', $diskSettings->name)) return $this->send(array('result' => 'fail', 'message' => dao::getError())); } diff --git a/module/instance/ui/setting.html.php b/module/instance/ui/setting.html.php index e2ae92846d..82f144ea93 100644 --- a/module/instance/ui/setting.html.php +++ b/module/instance/ui/setting.html.php @@ -67,7 +67,7 @@ formPanel set::label($lang->instance->adjustVol), set::value($diskSettings->size), set::placeholder($lang->instance->tips->resizeDisk), - set::min($diskSettings->used), + set::min($diskSettings->size), set::max($diskSettings->limit) ) )