geolba/tethys
6
0
Fork 0
Code Issues 2 Pull Requests Packages Projects 1 Releases Wiki Activity

- add archive disk to config\filesystems.php

Browse Source 
- correct getPath method with public path in app\models\File.php
- composer updates
This commit is contained in:
Arno Kaimbacher 2020-02-26 09:55:31 +01:00
parent 6d0638e201
commit 795313d3dd
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Publish/PublishController.php
View File

@ -5,7 +5,6 @@ use App\Http\Controllers\Controller;
use App\Models\Dataset; use App\Models\Dataset;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\View\View; use Illuminate\View\View;
use Illuminate\Http\Request;
class PublishController extends Controller 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] = ?)" //"select * from [documents] where [server_state] in (?) or ([server_state] = ? and [editor_id] = ?)"
$datasets = $builder $datasets = $builder
->where('server_state', 'reviewed') ->where('server_state', 'reviewed')
->get(); ->get();
return view('workflow.publish.index', [ return view('workflow.publish.index', [
'datasets' => $datasets, 'datasets' => $datasets,

3
app/Models/File.php
View File

@ -64,7 +64,8 @@ class File extends Model
*/ */
private function getPath() 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() public function exists()

10
composer.lock generated
View File

@ -3834,16 +3834,16 @@
}, },
{ {
"name": "phpdocumentor/reflection-docblock", "name": "phpdocumentor/reflection-docblock",
"version": "5.0.0", "version": "5.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
"reference": "a48807183a4b819072f26e347bbd0b5199a9d15f" "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/a48807183a4b819072f26e347bbd0b5199a9d15f", "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e",
"reference": "a48807183a4b819072f26e347bbd0b5199a9d15f", "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e",
"shasum": "" "shasum": ""
}, },
"require": { "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.", "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", "name": "phpdocumentor/type-resolver",

6
config/filesystems.php
View File

@ -54,7 +54,11 @@ return [
'url' => env('APP_URL').'/storage', 'url' => env('APP_URL').'/storage',
'visibility' => 'public', 'visibility' => 'public',
], ],
'archive' => [
'driver' => 'local',
'root' => '/storage/app/public',
'visibility' => 'public',
],
's3' => [ 's3' => [
'driver' => 's3', 'driver' => 's3',
'key' => 'your-key', 'key' => 'your-key',