colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made a couple of fixes during testing 

- Updated audit table so long entity names did not squish everything
  else.
- Added filtering to view service popular list so that recycle binned
  items did not cause issues.
This commit is contained in:
Dan Brown 2021-01-03 19:02:50 +00:00
parent 47a6c621ff
commit 75a795ab72
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Actions/ViewService.php
View File

@ -74,7 +74,12 @@ class ViewService
$query->whereIn('viewable_type', $this->entityProvider->getMorphClasses($filterModels)); $query->whereIn('viewable_type', $this->entityProvider->getMorphClasses($filterModels));
} }
return $query->with('viewable')->skip($skipCount)->take($count)->get()->pluck('viewable'); return $query->with('viewable')
->skip($skipCount)
->take($count)
->get()
->pluck('viewable')
->filter();
} }
/** /**

2
resources/views/settings/audit.blade.php
View File

@ -63,7 +63,7 @@
@include('partials.table-user', ['user' => $activity->user, 'user_id' => $activity->user_id]) @include('partials.table-user', ['user' => $activity->user, 'user_id' => $activity->user_id])
</td> </td>
<td>{{ $activity->type }}</td> <td>{{ $activity->type }}</td>
<td> <td width="40%">
@if($activity->entity) @if($activity->entity)
<a href="{{ $activity->entity->getUrl() }}" class="table-entity-item"> <a href="{{ $activity->entity->getUrl() }}" class="table-entity-item">
<span role="presentation" class="icon text-{{$activity->entity->getType()}}">@icon($activity->entity->getType())</span> <span role="presentation" class="icon text-{{$activity->entity->getType()}}">@icon($activity->entity->getType())</span>