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

Updated restricted usage on search and entity meta details

Browse Source 
Also removed now unused view.
This commit is contained in:
Dan Brown
2022-10-10 16:22:51 +01:00
parent 803934d020
commit 63056dbef4
7 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Entities/Models/Entity.php
View File

@@ -182,12 +182,9 @@ abstract class Entity extends Model implements Sluggable, Favouritable, Viewable
/**
* Check if this entity has a specific restriction set against it.
*/
public function hasRestriction(int $role_id, string $action): bool
public function hasPermissions(): bool
{
return $this->permissions()
->where('role_id', '=', $role_id)
->where($action, '=', true)
->count() > 0;
return $this->permissions()->count() > 0;
}
/**

4
app/Search/SearchRunner.php
View File

@@ -162,7 +162,7 @@ class SearchRunner
$entityQuery = $entityModelInstance->newQuery()->scopes('visible');
if ($entityModelInstance instanceof Page) {
$entityQuery->select(array_merge($entityModelInstance::$listAttributes, ['restricted', 'owned_by']));
$entityQuery->select(array_merge($entityModelInstance::$listAttributes, ['owned_by']));
} else {
$entityQuery->select(['*']);
}
@@ -447,7 +447,7 @@ class SearchRunner
protected function filterIsRestricted(EloquentBuilder $query, Entity $model, $input)
{
$query->where('restricted', '=', true);
$query->whereHas('permissions');
}
protected function filterViewedByMe(EloquentBuilder $query, Entity $model, $input)