Merge branch 'staging'

jringeisen · Feb 11, 2024 · be5ba09 · be5ba09
2 parents b73a0ca + 76112b9
commit be5ba09
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/app/Nova/Feedback.php b/app/Nova/Feedback.php
@@ -3,6 +3,7 @@
 namespace App\Nova;
 
 use App\Enums\FeedbackStatuses;
+use Laravel\Nova\Fields\BelongsTo;
 use Laravel\Nova\Fields\ID;
 use Laravel\Nova\Fields\Select;
 use Laravel\Nova\Fields\Text;
@@ -24,6 +25,10 @@ public function fields(NovaRequest $request): array
         return [
             ID::make()->sortable(),
 
+            BelongsTo::make('User')
+                ->searchable()
+                ->sortable(),
+
             Text::make('Title')
                 ->sortable()
                 ->rules('required', 'max:255'),

diff --git a/app/Nova/User.php b/app/Nova/User.php
@@ -4,7 +4,7 @@
 
 use Illuminate\Http\Request;
 use Illuminate\Validation\Rules;
-use Laravel\Nova\Fields\Gravatar;
+use Laravel\Nova\Fields\BelongsTo;
 use Laravel\Nova\Fields\ID;
 use Laravel\Nova\Fields\Password;
 use Laravel\Nova\Fields\Text;
@@ -45,7 +45,7 @@ public function fields(NovaRequest $request)
         return [
             ID::make()->sortable(),
 
-            Gravatar::make()->maxWidth(50),
+            BelongsTo::make('Parent', 'parent', User::class)->nullable(),
 
             Text::make('Name')
                 ->sortable()

diff --git a/app/Policies/UserPolicy.php b/app/Policies/UserPolicy.php
@@ -9,18 +9,21 @@ class UserPolicy
     public function view(User $authUser, User $user): bool
     {
         return $authUser->id === $user->parent_id
-            || $authUser->id === $user->id;
+            || $authUser->id === $user->id
+            || in_array($authUser->email, config('app.nova_admin_emails'));
     }
 
     public function update(User $authUser, User $user): bool
     {
         return $authUser->id === $user->parent_id
-            || $authUser->id === $user->id;
+            || $authUser->id === $user->id
+            || in_array($authUser->email, config('app.nova_admin_emails'));
     }
 
     public function delete(User $authUser, User $user): bool
     {
         return $authUser->id === $user->parent_id
-            || $authUser->id === $user->id;
+            || $authUser->id === $user->id
+            || in_array($authUser->email, config('app.nova_admin_emails'));
     }
 }