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

Allowed child entity permissions to override parent permissions

Browse Source 
Updated elements of a page display and sidebar render to allow
child permissions to work even when parent entitites have permission
set. This allows a page with a 'view' permission to be viewable even
when the parent book or chapter is not viewable.

Fixes #366
This commit is contained in:
Dan Brown
2017-04-22 13:39:34 +01:00
parent 4c985aac7e
commit a323b0d49c
5 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Repos/EntityRepo.php
View File

@ -348,6 +348,10 @@ class EntityRepo
foreach ($entities as $entity) {
if ($entity->chapter_id === 0 || $entity->chapter_id === '0') continue;
$parentKey = 'BookStack\\Chapter:' . $entity->chapter_id;
if (!isset($parents[$parentKey])) {
$tree[] = $entity;
continue;
}
$chapter = $parents[$parentKey];
$chapter->pages->push($entity);
}