webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-31 15:24:31 +03:00
Code Activity

Added owners to entity creation and updated tests

Browse Source
This commit is contained in:
Dan Brown
2020-12-30 22:18:28 +00:00
parent b493becadf
commit 4c580d1571
6 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Auth/Permissions/PermissionService.php
View File

@ -526,8 +526,10 @@ class PermissionService
$action = end($explodedPermission);
$this->currentAction = $action;
$nonJointPermissions = ['restrictions', 'image', 'attachment', 'comment'];
// Handle non entity specific jointPermissions
if (!($ownable instanceof Entity)) {
if (in_array($explodedPermission[0], $nonJointPermissions)) {
$allPermission = $this->currentUser() && $this->currentUser()->can($permission . '-all');
$ownPermission = $this->currentUser() && $this->currentUser()->can($permission . '-own');
$this->currentAction = 'view';

1
app/Entities/Repos/BaseRepo.php
View File

@ -34,6 +34,7 @@ class BaseRepo
$entity->forceFill([
'created_by' => user()->id,
'updated_by' => user()->id,
'owned_by' => user()->id,
]);
$entity->refreshSlug();
$entity->save();

1
app/Entities/Repos/PageRepo.php
View File

@ -130,6 +130,7 @@ class PageRepo
$page = (new Page())->forceFill([
'name' => trans('entities.pages_initial_name'),
'created_by' => user()->id,
'owned_by' => user()->id,
'updated_by' => user()->id,
'draft' => true,
]);