webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-10-25 06:37:36 +03:00
Code Activity

Permissions: Fixed check method to allow enum usage

Browse Source
This commit is contained in:
Dan Brown
2025-09-10 10:44:54 +01:00
parent 419dbadcfd
commit 573d692a59
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Permissions/PermissionApplicator.php
View File

@@ -76,12 +76,13 @@ class PermissionApplicator
* Checks if a user has the given permission for any items in the system. * Checks if a user has the given permission for any items in the system.
* Can be passed an entity instance to filter on a specific type. * Can be passed an entity instance to filter on a specific type.
*/ */
public function checkUserHasEntityPermissionOnAny(string $action, string $entityClass = ''): bool public function checkUserHasEntityPermissionOnAny(string|Permission $action, string $entityClass = ''): bool
{ {
$this->ensureValidEntityAction($action); $permissionName = is_string($action) ? $action : $action->value;
$this->ensureValidEntityAction($permissionName);
$permissionQuery = EntityPermission::query() $permissionQuery = EntityPermission::query()
->where($action, '=', true) ->where($permissionName, '=', true)
->whereIn('role_id', $this->getCurrentUserRoleIds()); ->whereIn('role_id', $this->getCurrentUserRoleIds());
if (!empty($entityClass)) { if (!empty($entityClass)) {