Fixed file uploading

Separate images storage path and files storage path. issue #78
LaravelRUS · Apr 15, 2016 · a1b5728 · a1b5728
1 parent cd8f6dd
commit a1b5728
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 39 deletions.
diff --git a/config/sleeping_owl.php b/config/sleeping_owl.php
@@ -64,6 +64,14 @@
 
     'imagesUploadDirectory' => 'images/uploads',
 
+    /*
+    |--------------------------------------------------------------------------
+    |  Directory to upload files to (relative to public directory)
+    |--------------------------------------------------------------------------
+    */
+
+    'filesUploadDirectory' => 'files/uploads',
+
     /*
     |--------------------------------------------------------------------------
     |  Template to use

diff --git a/resources/views/default/form/element/file.blade.php b/resources/views/default/form/element/file.blade.php
@@ -6,7 +6,7 @@
 			<span class="text-danger">*</span>
 		@endif
 	</label>
-	<div class="imageUpload" data-target="{{ route('admin.form.element.image.uploadFile') }}" data-token="{{ csrf_token() }}">
+	<div class="imageUpload" data-target="{{ route('admin.form.element.file.uploadFile') }}" data-token="{{ csrf_token() }}">
 		<div>
 			<div class="thumbnail">
 				<div class="no-value {{ empty($value) ? '' : 'hidden' }}">

diff --git a/resources/views/default/form/element/image.blade.php b/resources/views/default/form/element/image.blade.php
@@ -6,7 +6,7 @@
 			<span class="text-danger">*</span>
 		@endif
 	</label>
-	<div class="imageUpload" data-target="{{ route('admin.form.element.image.uploadImage') }}" data-token="{{ csrf_token() }}">
+	<div class="imageUpload" data-target="{{ route('admin.form.element.file.uploadImage') }}" data-token="{{ csrf_token() }}">
 		<div>
 			<div class="thumbnail">
 				<img class="no-value {{ empty($value) ? '' : 'hidden' }}" src="http://www.placehold.it/200x150/EFEFEF/AAAAAA&text=no+image" width="200px" height="150px" />

diff --git a/resources/views/default/form/element/images.blade.php b/resources/views/default/form/element/images.blade.php
@@ -6,7 +6,7 @@
 			<span class="text-danger">*</span>
 		@endif
 	</label>
-	<div class="imageUploadMultiple" data-target="{{ route('admin.form.element.image.uploadImage') }}" data-token="{{ csrf_token() }}">
+	<div class="imageUploadMultiple" data-target="{{ route('admin.form.element.file.uploadImage') }}" data-token="{{ csrf_token() }}">
 		<div class="row form-group images-group">
 			@foreach ($value as $image)
 				<div class="col-xs-6 col-md-3 imageThumbnail">

diff --git a/src/Form/Element/File.php b/src/Form/Element/File.php
@@ -2,13 +2,63 @@
 
 namespace SleepingOwl\Admin\Form\Element;
 
-class File extends Image
+use Request;
+use Route;
+use Response;
+use Validator;
+use SleepingOwl\Admin\Contracts\WithRoutesInterface;
+
+class File extends NamedFormElement implements WithRoutesInterface
 {
+
     /**
      * @var string
      */
     protected static $route = 'uploadFile';
 
+    public static function registerRoutes()
+    {
+        Route::post('FormElements/image/'.static::$route, ['as' => 'admin.form.element.file.'.static::$route, function () {
+                $validator = Validator::make(Request::all(), static::uploadValidationRules());
+
+                static::uploadValidationRules($validator);
+
+                if ($validator->fails()) {
+                    return Response::make($validator->errors()->get('file'), 400);
+                }
+
+                $file = Request::file('file');
+                $filename = md5(time().$file->getClientOriginalName()).'.'.$file->getClientOriginalExtension();
+                $path = static::getUploadPath();
+                $fullPath = public_path($path);
+                $file->move($fullPath, $filename);
+
+                $value = $path.'/'.$filename;
+
+                return [
+                    'url' => asset($value),
+                    'value' => $value,
+                ];
+            },
+        ]);
+    }
+
+    /**
+     * @param \Illuminate\Validation\Validator $validator
+     */
+    protected static function validate(\Illuminate\Validation\Validator $validator)
+    {
+
+    }
+
+    /**
+     * @return string
+     */
+    protected static function getUploadPath()
+    {
+        return config('sleeping_owl.filesUploadDirectory', 'files/uploads');
+    }
+
     /**
      * @return array
      */

diff --git a/src/Form/Element/Image.php b/src/Form/Element/Image.php
@@ -2,52 +2,37 @@
 
 namespace SleepingOwl\Admin\Form\Element;
 
-use Request;
-use Route;
-use Response;
-use Validator;
-use SleepingOwl\Admin\Contracts\WithRoutesInterface;
-
-class Image extends NamedFormElement implements WithRoutesInterface
+class Image extends File
 {
+
     /**
      * @var string
      */
     protected static $route = 'uploadImage';
 
-    public static function registerRoutes()
+    /**
+     * @param \Illuminate\Validation\Validator $validator
+     */
+    protected static function validate(\Illuminate\Validation\Validator $validator)
     {
-        Route::post('FormElements/image/'.static::$route, ['as' => 'admin.form.element.image.'.static::$route, function () {
-            $validator = Validator::make(Request::all(), static::uploadValidationRules());
-
-            $validator->after(function ($validator) {
-
-                /** @var \Illuminate\Http\UploadedFile $file */
-                $file = array_get($validator->attributes(), 'file');
+        $validator->after(function ($validator) {
+            /** @var \Illuminate\Http\UploadedFile $file */
+            $file = array_get($validator->attributes(), 'file');
 
-                $size = getimagesize($file->getRealPath());
+            $size = getimagesize($file->getRealPath());
 
-                if (! $size) {
-                    $validator->errors()->add('file', trans('sleeping_owl::validation.not_image'));
-                }
-            });
-
-            if ($validator->fails()) {
-                return Response::make($validator->errors()->get('file'), 400);
+            if (! $size) {
+                $validator->errors()->add('file', trans('sleeping_owl::validation.not_image'));
             }
+        });
+    }
 
-            $file = Request::file('file');
-            $filename = md5(time().$file->getClientOriginalName()).'.'.$file->getClientOriginalExtension();
-            $path = config('sleeping_owl.imagesUploadDirectory');
-            $fullpath = public_path($path);
-            $file->move($fullpath, $filename);
-            $value = $path.'/'.$filename;
-
-            return [
-                'url'   => asset($value),
-                'value' => $value,
-            ];
-        }]);
+    /**
+     * @return string
+     */
+    protected static function getUploadPath()
+    {
+        return config('sleeping_owl.imagesUploadDirectory', 'images/uploads');
     }
 
     /**