[TM-812] Use can instead of hasPermissionTo, as it doesn't throw an e…

…rror when the permission isn't found.
wri · Apr 15, 2024 · c4dbdef · c4dbdef
1 parent 3a466c3
commit c4dbdef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/Http/Controllers/Traits/IsAdminIndex.php b/app/Http/Controllers/Traits/IsAdminIndex.php
@@ -33,7 +33,7 @@ protected function isolateAuthorizedFrameworks(QueryBuilder $query, string $tabl
             $query->where(function ($query) use ($tableName, $frameworkNames, $user) {
                 foreach ($frameworkNames as $framework) {
                     $frameworkPermission = 'framework-' . $framework;
-                    if ($user->hasPermissionTo($frameworkPermission)) {
+                    if ($user->can($frameworkPermission)) {
                         $query->orWhere("$tableName.framework_key", $framework);
                     }
                 }

diff --git a/app/Http/Controllers/V2/UpdateRequests/AdminIndexUpdateRequestsController.php b/app/Http/Controllers/V2/UpdateRequests/AdminIndexUpdateRequestsController.php
@@ -59,7 +59,7 @@ public function __invoke(Request $request): UpdateRequestsCollection
             $query->where(function ($query) use ($frameworkNames, $user) {
                 foreach ($frameworkNames as $framework) {
                     $frameworkPermission = 'framework-' . $framework;
-                    if ($user->hasPermissionTo($frameworkPermission)) {
+                    if ($user->can($frameworkPermission)) {
                         $query->orWhere('framework_key', $framework);
                     }
                 }