Merge pull request #477 from AcclaroInc/bug/using-custom-volume-if-an…

…y-selected-to-upload-assets fixed: an issue where uploaded assets saving to temp directory only
AcclaroInc · Sep 28, 2023 · af650e1 · af650e1
2 parents 551aeb0 + 6dfdcc0
commit af650e1
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/controllers/FilesController.php b/src/controllers/FilesController.php
@@ -230,7 +230,8 @@ public function actionImportFile()
 
                                 $fileInfo = pathinfo($filename);
 
-                                $folder = Craft::$app->getAssets()->getUserTemporaryUploadFolder();
+                                $uploadVolumeId = ArrayHelper::getValue(Translations::getInstance()->getSettings(), 'uploadVolume');
+                                $folder = $this->getFolderByVolumeId($uploadVolumeId);
 
                                 $pathInfo = pathinfo($file);
 
@@ -311,7 +312,8 @@ public function actionImportFile()
                     } else {
                         $filename = Assets::prepareAssetName($file->name);
 
-                        $folder = Craft::$app->getAssets()->getUserTemporaryUploadFolder();
+                        $uploadVolumeId = ArrayHelper::getValue(Translations::getInstance()->getSettings(), 'uploadVolume');
+                        $folder = $this->getFolderByVolumeId($uploadVolumeId);
 
                         $compatibleFilename = $file->tempName . '.' . Constants::FILE_FORMAT_TXT;
 
@@ -576,4 +578,12 @@ private function getZipName($order) {
 
         return $zip_name;
     }
+
+    private function getFolderByVolumeId($volumeId) {
+        if ($volumeId == 0) {
+            return Craft::$app->getAssets()->getUserTemporaryUploadFolder();
+        } else {
+            return Craft::$app->getAssets()->getRootFolderByVolumeId($volumeId);
+        }
+    }
 }