Update ResourceForUser.php

Fix when a User has the ability to "view" entries but is not restricted to only "view own entries".
eminiarts · Mar 8, 2019 · 684a9cb · 684a9cb
1 parent 50e93a8
commit 684a9cb
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/src/Nova/ResourceForUser.php b/src/Nova/ResourceForUser.php
@@ -22,6 +22,11 @@ public static function detailQuery(NovaRequest $request, $query)
             return $query;
         }
 
+        // User Can View all Entries and is not restricted to its own
+        if (!$user->hasPermissionTo('view own ' . parent::uriKey()) && $user->hasPermissionTo('view ' . parent::uriKey())) {
+            return $query;
+        }
+
         return parent::detailQuery($request, $query->where('user_id', $user->id));
     }
 
@@ -67,6 +72,11 @@ public static function relatableQuery(NovaRequest $request, $query)
             return parent::relatableQuery($request, $query);
         }
 
+        // User Can View all Entries and is not restricted to its own
+        if (!$user->hasPermissionTo('view own ' . parent::uriKey()) && $user->hasPermissionTo('view ' . parent::uriKey())) {
+            return parent::relatableQuery($request, $query);
+        }
+
         return parent::relatableQuery($request, $query->where('user_id', $user->id));
     }
 
@@ -86,6 +96,11 @@ public static function scoutQuery(NovaRequest $request, $query)
             return $query;
         }
 
+        // User Can View all Entries and is not restricted to its own
+        if (!$user->hasPermissionTo('view own ' . parent::uriKey()) && $user->hasPermissionTo('view ' . parent::uriKey())) {
+            return $query;
+        }
+
         return $query->where('user_id', $user->id);
     }
 }