소스 검색

fix msterDisk bug

andre 4 년 전
부모
커밋
d7643f8b0a
2개의 변경된 파일9개의 추가작업 그리고 19개의 파일을 삭제
  1. 9 10
      app/UI/Disk/Providers/DiskProvider.php
  2. 0 9
      app/UI/VmCreate/Providers/VmCreateProvider.php

+ 9 - 10
app/UI/Disk/Providers/DiskProvider.php

@@ -92,16 +92,6 @@ class DiskProvider extends BaseDataProvider implements ClientArea
         {
         {
             $hdd->setIothread(1);
             $hdd->setIothread(1);
         }
         }
-        //master
-
-        logModuleCall(
-            'proxmoxCloud',
-            __FUNCTION__,
-            $this->formData,
-            'Debug',
-            $hdd
-        );
-
         $vmModel->disks += $this->formData['additionalDiskSize'];
         $vmModel->disks += $this->formData['additionalDiskSize'];
         $hdd->create();
         $hdd->create();
         $vmModel->save();
         $vmModel->save();
@@ -170,6 +160,15 @@ class DiskProvider extends BaseDataProvider implements ClientArea
                 ->setStatusError()
                 ->setStatusError()
                 ->setMessageAndTranslate('The master hard disk cannot be deleted');
                 ->setMessageAndTranslate('The master hard disk cannot be deleted');
         }
         }
+
+        logModuleCall(
+            'proxmoxCloud',
+            __FUNCTION__,
+            $this->formData,
+            'Debug',
+            $hdd
+        );
+
         $hdd->delete();
         $hdd->delete();
 
 
         unset($this->vm);
         unset($this->vm);

+ 0 - 9
app/UI/VmCreate/Providers/VmCreateProvider.php

@@ -121,15 +121,6 @@ class VmCreateProvider extends BaseModelDataProvider implements ClientArea
         }
         }
         $this->vmModel = new VmModel();
         $this->vmModel = new VmModel();
         $this->fillVmModel();
         $this->fillVmModel();
-
-        logModuleCall(
-            'proxmoxCloud',
-            __FUNCTION__,
-            $this->formData,
-            'Debug',
-            $this->vmModel
-        );
-
         if($this->vmTemplate instanceof  Kvm){
         if($this->vmTemplate instanceof  Kvm){
             $this->vmModel->data = ['osTemplate'=> $this->vmTemplate->status()['name']];
             $this->vmModel->data = ['osTemplate'=> $this->vmTemplate->status()['name']];
         }else{
         }else{