diff --git a/app/Http/Controllers/MediaController.php b/app/Http/Controllers/MediaController.php index dc59ba0..5020feb 100644 --- a/app/Http/Controllers/MediaController.php +++ b/app/Http/Controllers/MediaController.php @@ -72,6 +72,13 @@ class MediaController extends Controller } $media = $media->paginate($perPage)->onEachSide(1); + + // Transform the 'password' field of each item in the collection + $media->getCollection()->transform(function ($item) { + $item->password = $item->password ? 'yes' : null; + return $item; + }); + return $media; } diff --git a/app/Models/Media.php b/app/Models/Media.php index ece2c7d..146912d 100644 --- a/app/Models/Media.php +++ b/app/Models/Media.php @@ -54,8 +54,7 @@ class Media extends Model * @var array */ protected $casts = [ - 'variants' => 'array', - 'password' => 'hashed' + 'variants' => 'array' ]; /** diff --git a/app/Traits/HasFiles.php b/app/Traits/HasFiles.php index fac2654..5146afd 100644 --- a/app/Traits/HasFiles.php +++ b/app/Traits/HasFiles.php @@ -10,7 +10,11 @@ trait HasFiles { public function files($collection = null) { +// return $this->morphToMany(Media::class, 'mediable') +// ->wherePivot('collection', $collection); + return $this->morphToMany(Media::class, 'mediable') + ->selectRaw("*, CASE WHEN password IS NULL THEN NULL ELSE 'yes' END AS password") ->wherePivot('collection', $collection); } diff --git a/resources/js/media-picker.js b/resources/js/media-picker.js index 45bf934..3822c1b 100644 --- a/resources/js/media-picker.js +++ b/resources/js/media-picker.js @@ -131,6 +131,7 @@ const SMMediaPicker = { x-on:click="SMMediaPicker.updateSelection(item.name)" x-on:dblclick="SMMediaPicker.doubleClick(item.name)" > +
diff --git a/resources/views/admin/media/index.blade.php b/resources/views/admin/media/index.blade.php index adb1bf4..9b1dda2 100644 --- a/resources/views/admin/media/index.blade.php +++ b/resources/views/admin/media/index.blade.php @@ -25,7 +25,7 @@ @foreach ($media as $medium) - {{ $medium->title }}{{ $medium->title }} + {{ $medium->title }}{{ $medium->title }}{!! $medium->password !== null ? '': '' !!} {{ \App\Helpers::bytesToString($medium->size) }} {{ $medium->mime_type }} {{ \Carbon\Carbon::parse($medium->created_at)->format('M j Y, g:i a') }} diff --git a/resources/views/components/ui/filelist.blade.php b/resources/views/components/ui/filelist.blade.php index bbcb687..1c45867 100644 --- a/resources/views/components/ui/filelist.blade.php +++ b/resources/views/components/ui/filelist.blade.php @@ -12,9 +12,12 @@

{{ $label }}