STEMMechanics/Website
1
0
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects Releases 3 Wiki Activity

changed default permission from null to ''

Browse Source
This commit is contained in:
James Collins
2023-04-10 14:46:48 +10:00
parent b4f4450573
commit fabe027d54
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Conductors/MediaConductor.php
View File

@@ -32,7 +32,7 @@ class MediaConductor extends Conductor
$user = auth()->user(); $user = auth()->user();
if ($user === null || $user->hasPermission('admin/media') === false) { if ($user === null || $user->hasPermission('admin/media') === false) {
$fields = arrayRemoveItem($fields, 'permission'); $fields = arrayRemoveItem($fields, ['permission', 'storage']);
} }
return $fields; return $fields;
@@ -48,9 +48,9 @@ class MediaConductor extends Conductor
{ {
$user = auth()->user(); $user = auth()->user();
if ($user === null) { if ($user === null) {
$builder->whereNull('permission'); $builder->where('permission', '');
} else { } else {
$builder->whereNull('permission')->orWhereIn('permission', $user->permissions); $builder->where('permission', '')->orWhereIn('permission', $user->permissions);
} }
} }
@@ -62,7 +62,7 @@ class MediaConductor extends Conductor
*/ */
public static function viewable(Model $model) public static function viewable(Model $model)
{ {
if ($model->permission !== null) { if ($model->permission !== '') {
$user = auth()->user(); $user = auth()->user();
if ($user === null || $user->hasPermission($model->permission) === false) { if ($user === null || $user->hasPermission($model->permission) === false) {
return false; return false;