github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-06-04 08:54:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added transclusion tests and fixed other tests

Browse Source
This commit is contained in:
Dan Brown
2017-01-21 16:16:27 +00:00
parent 56d58ad8e5
commit 2d4034f3b7
4 changed files with 42 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Services/PermissionService.php
View File

@ -157,7 +157,7 @@ class PermissionService
*/
public function buildJointPermissionsForEntity(Entity $entity)
{
$roles = $this->role->with('jointPermissions')->get();
$roles = $this->role->get();
$entities = collect([$entity]);
if ($entity->isA('book')) {
@ -177,7 +177,7 @@ class PermissionService
*/
public function buildJointPermissionsForEntities(Collection $entities)
{
$roles = $this->role->with('jointPermissions')->get();
$roles = $this->role->get();
$this->deleteManyJointPermissionsForEntities($entities);
$this->createManyJointPermissions($entities, $roles);
}
@ -564,6 +564,7 @@ class PermissionService
});
});
});
$this->clean();
return $q;
}