Skip to content

Commit 684a9cb

Browse files
authored
Update ResourceForUser.php
Fix when a User has the ability to "view" entries but is not restricted to only "view own entries".
1 parent 50e93a8 commit 684a9cb

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

src/Nova/ResourceForUser.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ public static function detailQuery(NovaRequest $request, $query)
2222
return $query;
2323
}
2424

25+
// User Can View all Entries and is not restricted to its own
26+
if (!$user->hasPermissionTo('view own ' . parent::uriKey()) && $user->hasPermissionTo('view ' . parent::uriKey())) {
27+
return $query;
28+
}
29+
2530
return parent::detailQuery($request, $query->where('user_id', $user->id));
2631
}
2732

@@ -67,6 +72,11 @@ public static function relatableQuery(NovaRequest $request, $query)
6772
return parent::relatableQuery($request, $query);
6873
}
6974

75+
// User Can View all Entries and is not restricted to its own
76+
if (!$user->hasPermissionTo('view own ' . parent::uriKey()) && $user->hasPermissionTo('view ' . parent::uriKey())) {
77+
return parent::relatableQuery($request, $query);
78+
}
79+
7080
return parent::relatableQuery($request, $query->where('user_id', $user->id));
7181
}
7282

@@ -86,6 +96,11 @@ public static function scoutQuery(NovaRequest $request, $query)
8696
return $query;
8797
}
8898

99+
// User Can View all Entries and is not restricted to its own
100+
if (!$user->hasPermissionTo('view own ' . parent::uriKey()) && $user->hasPermissionTo('view ' . parent::uriKey())) {
101+
return $query;
102+
}
103+
89104
return $query->where('user_id', $user->id);
90105
}
91106
}

0 commit comments

Comments
 (0)