Browse Source

Merge pull request #1704 from laradocs/file-upload

Tall 3 years ago
parent
commit
8ea590dd7d
3 changed files with 17 additions and 12 deletions
  1. 12 11
      .gitignore
  2. 4 0
      config/admin.php
  3. 1 1
      src/Form/Field/UploadField.php

+ 12 - 11
.gitignore

@@ -1,11 +1,12 @@
-/vendor/
-composer.lock
-.idea
-.php_cs.cache
-/node_modules
-package-lock.json
-mix-manifest.json
-/images/
-pre-dist
-/laravel-tests
-*.bak.*
+/vendor/
+composer.lock
+.idea
+.php_cs.cache
+/node_modules
+package-lock.json
+mix-manifest.json
+/images/
+pre-dist
+/laravel-tests
+*.bak.*
+.DS_Store

+ 4 - 0
config/admin.php

@@ -269,6 +269,10 @@ return [
             'image' => 'images',
             'file'  => 'files',
         ],
+
+        // Overwriting an existing file.
+        'override' => env('ADMIN_UPLOAD_OVERRIDE', false),
+
     ],
 
     /*

+ 1 - 1
src/Form/Field/UploadField.php

@@ -98,7 +98,7 @@ trait UploadField
      */
     public function renameIfExists(UploadedFile $file)
     {
-        if ($this->getStorage()->exists("{$this->getDirectory()}/$this->name")) {
+        if ($this->getStorage()->exists("{$this->getDirectory()}/$this->name") && ! config('admin.upload.override')) {
             $this->name = $this->generateUniqueName($file);
         }
     }