nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-05-19 03:35:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

translations update

Browse Source
This commit is contained in:
carodej
2020-07-10 17:05:30 +02:00
parent 5bd6455f7f
commit 3c3a18cf6b
29 changed files with 503 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/FileManagerFile.php
+3 -3
View File
@@ -116,8 +116,8 @@ class FileManagerFile extends Model
*/
public function getThumbnailAttribute()
{
// Get thumbnail from s3
if ($this->attributes['thumbnail'] && is_storage_driver(['s3', 'spaces'])) {
// Get thumbnail from external storage
if ($this->attributes['thumbnail'] && is_storage_driver(['s3', 'spaces', 'wasabi', 'backblaze'])) {
return Storage::temporaryUrl('file-manager/' . $this->attributes['thumbnail'], now()->addHour());
}
@@ -146,7 +146,7 @@ class FileManagerFile extends Model
public function getFileUrlAttribute()
{
// Get file from s3
if (is_storage_driver(['s3', 'spaces'])) {
if (is_storage_driver(['s3', 'spaces', 'wasabi', 'backblaze'])) {
$header = [
"ResponseAcceptRanges" => "bytes",
app/User.php
+13
View File
@@ -10,6 +10,7 @@ use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Notification;
use Illuminate\Support\Facades\Storage;
use Laravel\Cashier\Billable;
use Laravel\Passport\HasApiTokens;
use Rinvex\Subscriptions\Traits\HasSubscriptions;
@@ -151,6 +152,11 @@ class User extends Authenticatable
return $user_capacity;
}
/**
* Get user full folder tree
*
* @return \Illuminate\Database\Eloquent\Builder[]|\Illuminate\Database\Eloquent\Collection
*/
public function getFolderTreeAttribute()
{
return FileManagerFolder::with(['folders.shared', 'shared:token,id,item_id,permission,protected'])
@@ -166,6 +172,13 @@ class User extends Authenticatable
*/
public function getAvatarAttribute()
{
// Get avatar from external storage
if ($this->attributes['avatar'] && is_storage_driver(['s3', 'spaces', 'wasabi', 'backblaze'])) {
return Storage::temporaryUrl($this->attributes['avatar'], now()->addDay());
}
// Get avatar from local storage
if ($this->attributes['avatar']) {
return url('/' . $this->attributes['avatar']);
}