Merge pull request #69 from ahmedkandel/master

Fix broken upload via button
InfinetyEs · Aug 20, 2019 · 25acea7 · 25acea7
2 parents 2faaf11 + 0e0ccd9
commit 25acea7
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/dist/js/field.js b/dist/js/field.js
diff --git a/dist/js/tool.js b/dist/js/tool.js
diff --git a/resources/js/components/Manager.vue b/resources/js/components/Manager.vue
@@ -462,8 +462,8 @@ export default {
         },
 
         uploadFiles(data) {
-            let files = this.formatFiles(data.files);
-            let folders = this.formatFiles(data.folders);
+            let files = this.formatFiles(data.files || []);
+            let folders = this.formatFiles(data.folders || []);
 
             if (files.length > 0) {
                 this.$emit('uploadFiles', files, 'files');

diff --git a/resources/js/components/ModalFileManager.vue b/resources/js/components/ModalFileManager.vue
@@ -271,7 +271,7 @@ export default {
         },
 
         uploadFilesByButton(e) {
-            this.$refs.manager.uploadFiles(e.target.files);
+            this.$refs.manager.uploadFiles({ files: Array.from(e.target.files) });
         },
 
         showInfoItem(item) {

diff --git a/resources/js/components/Tool.vue b/resources/js/components/Tool.vue
@@ -309,7 +309,7 @@ export default {
         },
 
         uploadFilesByButton(e) {
-            this.$refs.manager.uploadFiles(e.target.files, 'files');
+            this.$refs.manager.uploadFiles({ files: Array.from(e.target.files) }, 'files');
         },
 
         openRenameModal(type, path) {

diff --git a/src/Http/Services/GetFiles.php b/src/Http/Services/GetFiles.php
@@ -195,7 +195,7 @@ public function generateId($file)
      */
     public function setRelativePath($folder)
     {
-        $defaultPath = $this->storage->path('/');
+        $defaultPath = $this->storage->getDriver()->getAdapter()->getPathPrefix();
 
         $publicPath = str_replace($defaultPath, '', $folder);
 
@@ -463,7 +463,7 @@ public function generateParent($folder)
      */
     public function getPaths($currentFolder)
     {
-        $defaultPath = $this->cleanSlashes($this->storage->path('/'));
+        $defaultPath = $this->cleanSlashes($this->storage->getDriver()->getAdapter()->getPathPrefix());
         $currentPath = $this->cleanSlashes($this->storage->path($currentFolder));
 
         $paths = $currentPath;