webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-30 04:23:11 +03:00
Code Activity

Renamed and cleaned up existing permission service classes use

Browse Source
This commit is contained in:
Dan Brown
2022-07-12 20:15:41 +01:00
parent 2d4f708c79
commit b0a4d3d059
22 changed files with 140 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/helpers.php
View File

@ -1,6 +1,6 @@
<?php
use BookStack\Auth\Permissions\PermissionService;
use BookStack\Auth\Permissions\PermissionApplicator;
use BookStack\Auth\User;
use BookStack\Model;
use BookStack\Settings\SettingService;
@ -65,9 +65,9 @@ function userCan(string $permission, Model $ownable = null): bool
}
// Check permission on ownable item
$permissionService = app(PermissionService::class);
$permissions = app(PermissionApplicator::class);
return $permissionService->checkOwnableUserAccess($ownable, $permission);
return $permissions->checkOwnableUserAccess($ownable, $permission);
}
/**
@ -76,9 +76,9 @@ function userCan(string $permission, Model $ownable = null): bool
*/
function userCanOnAny(string $permission, string $entityClass = null): bool
{
$permissionService = app(PermissionService::class);
$permissions = app(PermissionApplicator::class);
return $permissionService->checkUserHasPermissionOnAnything($permission, $entityClass);
return $permissions->checkUserHasPermissionOnAnything($permission, $entityClass);
}
/**