浏览代码

change test to slider for disk create

andre 4 年之前
父节点
当前提交
9545ded8ec
共有 2 个文件被更改,包括 23 次插入13 次删除
  1. 18 8
      app/UI/Disk/Forms/CreateForm.php
  2. 5 5
      app/UI/Disk/Providers/DiskProvider.php

+ 18 - 8
app/UI/Disk/Forms/CreateForm.php

@@ -61,15 +61,25 @@ class CreateForm extends BaseForm implements ClientArea
 //        $field->setDescription('description');
         $this->addField($field);
         //bus
-        if(count($this->configuration()->getAdditionalDiskType()) > 1){
-            $field = new Select('bus');
-            $options=[];
-            foreach( $this->configuration()->getAdditionalDiskType() as $entery){
-                $options[$entery] = sl("lang")->abtr($entery);
-            }
-            $field->setAvailableValues($options);
-            $this->addField($field);
+        $field = new Select('bus');
+        $options=[];
+        foreach( $this->configuration()->getAdditionalDiskType() as $entery){
+            $options[$entery] = sl("lang")->abtr($entery);
         }
+        $field->setAvailableValues($options);
+        if(count($this->configuration()->getAdditionalDiskType()) == 1) {
+
+            logModuleCall(
+                'proxmoxCloud',
+                __FUNCTION__,
+                $this->field,
+                'Debug',
+                $this->configuration()->getAdditionalDiskType()
+            );
+
+            $field->addHtmlAttribute('hidden', true);
+        }
+        $this->addField($field);
         //format
         if(count($this->configuration()->getAdditionalDiskFormat()) > 1){
             $field = new Select('format');

+ 5 - 5
app/UI/Disk/Providers/DiskProvider.php

@@ -63,7 +63,7 @@ class DiskProvider extends BaseDataProvider implements ClientArea
         $hdd->setApi($this->api());
         $hdd->setPath($vm->getPath() . "/config");
         $hdd->setStorage($storage)
-            ->setSize($this->formData['size'])
+            ->setSize($this->formData['additionalDiskSize'])
             ->setMedia("disk")
             ->setFormat($this->formData['format'])
             ->setBackup($this->configuration()->isPermissionAdditionalDiskBackup() && $this->formData['backup'] == "on" ? null : 0);
@@ -92,7 +92,7 @@ class DiskProvider extends BaseDataProvider implements ClientArea
         {
             $hdd->setIothread(1);
         }
-        $vmModel->disks += $this->formData['size'];
+        $vmModel->disks += $this->formData['additionalDiskSize'];
         $hdd->create();
         $vmModel->save();
         $resourceManager = new ResourceManager();
@@ -109,16 +109,16 @@ class DiskProvider extends BaseDataProvider implements ClientArea
         $vmModel  = \ModulesGarden\ProxmoxAddon\Core\Helper\sl('Vm')->getVmModel();
         $vmId = $vmModel->id;
         $hdd = $vm->findHardDiskById($this->formData['id']);
-        if ((int)$hdd->getGb() > (int)$this->formData['size'])
+        if ((int)$hdd->getGb() > (int)$this->formData['additionalDiskSize'])
         {
             return (new HtmlDataJsonResponse())
                 ->setStatusError()
                 ->setMessageAndTranslate('Downgrading the disk size is restricted');
         }
         //resize
-        if ((int)$hdd->getGb() < (int)$this->formData['size'])
+        if ((int)$hdd->getGb() < (int)$this->formData['additionalDiskSize'])
         {
-            $size = "+" . abs((int)$this->formData['size'] - (int)$hdd->getGb()) . "G";
+            $size = "+" . abs((int)$this->formData['additionalDiskSize'] - (int)$hdd->getGb()) . "G";
             $hdd->resize($size);
         }
         if($hdd->isMaster()){