From 795313d3ddb3bde5b59f44f6107bc31b0affafde Mon Sep 17 00:00:00 2001 From: Arno Kaimbacher Date: Wed, 26 Feb 2020 09:55:31 +0100 Subject: [PATCH] - add archive disk to config\filesystems.php - correct getPath method with public path in app\models\File.php - composer updates --- app/Http/Controllers/Publish/PublishController.php | 2 -- app/Models/File.php | 3 ++- composer.lock | 10 +++++----- config/filesystems.php | 6 +++++- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/Publish/PublishController.php b/app/Http/Controllers/Publish/PublishController.php index 8e3c4d8..da4fc00 100644 --- a/app/Http/Controllers/Publish/PublishController.php +++ b/app/Http/Controllers/Publish/PublishController.php @@ -5,7 +5,6 @@ use App\Http\Controllers\Controller; use App\Models\Dataset; use Illuminate\Support\Facades\Auth; use Illuminate\View\View; -use Illuminate\Http\Request; class PublishController extends Controller { @@ -28,7 +27,6 @@ class PublishController extends Controller //"select * from [documents] where [server_state] in (?) or ([server_state] = ? and [editor_id] = ?)" $datasets = $builder ->where('server_state', 'reviewed') - ->get(); return view('workflow.publish.index', [ 'datasets' => $datasets, diff --git a/app/Models/File.php b/app/Models/File.php index 2a5dd2f..246caf8 100644 --- a/app/Models/File.php +++ b/app/Models/File.php @@ -64,7 +64,8 @@ class File extends Model */ private function getPath() { - return storage_path('app/public/' . $this->path_name); + //return storage_path('app/public/' . $this->path_name); + return public_path('storage/' . $this->path_name); } public function exists() diff --git a/composer.lock b/composer.lock index feb85ef..ca0e7c1 100755 --- a/composer.lock +++ b/composer.lock @@ -3834,16 +3834,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.0.0", + "version": "5.1.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "a48807183a4b819072f26e347bbd0b5199a9d15f" + "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/a48807183a4b819072f26e347bbd0b5199a9d15f", - "reference": "a48807183a4b819072f26e347bbd0b5199a9d15f", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e", + "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e", "shasum": "" }, "require": { @@ -3883,7 +3883,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2020-02-09T09:16:15+00:00" + "time": "2020-02-22T12:28:44+00:00" }, { "name": "phpdocumentor/type-resolver", diff --git a/config/filesystems.php b/config/filesystems.php index 0aa9d48..f532305 100755 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -54,7 +54,11 @@ return [ 'url' => env('APP_URL').'/storage', 'visibility' => 'public', ], - + 'archive' => [ + 'driver' => 'local', + 'root' => '/storage/app/public', + 'visibility' => 'public', + ], 's3' => [ 'driver' => 's3', 'key' => 'your-key',