Enhanced how activities are shown on items in recycle bin

diff --git a/app/Actions/ActivityService.php b/app/Actions/ActivityService.php
index e6b004f01fb0bc15d3b892ba6f56c49676e31cdc..4e5b1f36575ff74c5439fe1518c372d94ae448f6 100644 (file)
--- a/app/Actions/ActivityService.php
+++ b/app/Actions/ActivityService.php
@@ -3,6 +3,7 @@
 use BookStack\Auth\Permissions\PermissionService;
 use BookStack\Auth\User;
 use BookStack\Entities\Entity;
 use BookStack\Auth\Permissions\PermissionService;
 use BookStack\Auth\User;
 use BookStack\Entities\Entity;

+use Illuminate\Database\Eloquent\Relations\Relation;

 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 


@@ -104,7 +105,9 @@ class ActivityService
         $activity = $this->permissionService
             ->filterRestrictedEntityRelations($query, 'activities', 'entity_id', 'entity_type')
             ->orderBy('created_at', 'desc')
         $activity = $this->permissionService
             ->filterRestrictedEntityRelations($query, 'activities', 'entity_id', 'entity_type')
             ->orderBy('created_at', 'desc')

-            ->with(['entity', 'user.avatar'])
+            ->with(['entity' => function (Relation $query) {
+                $query->withTrashed();
+            }, 'user.avatar'])

             ->skip($count * ($page - 1))
             ->take($count)
             ->get();
             ->skip($count * ($page - 1))
             ->take($count)
             ->get();

diff --git a/resources/views/partials/activity-item.blade.php b/resources/views/partials/activity-item.blade.php
index 4fd8dde1b58550fbf1f0f6c59c84ead73f88c11e..eebfb591a4af40713816963b5c978d5a6b3ba171 100644 (file)
--- a/resources/views/partials/activity-item.blade.php
+++ b/resources/views/partials/activity-item.blade.php
@@ -16,10 +16,14 @@
 
     {{ $activity->getText() }}
 
 
     {{ $activity->getText() }}
 

-    @if($activity->entity)
+    @if($activity->entity && is_null($activity->entity->deleted_at))

         <a href="{{ $activity->entity->getUrl() }}">{{ $activity->entity->name }}</a>
     @endif
 
         <a href="{{ $activity->entity->getUrl() }}">{{ $activity->entity->name }}</a>
     @endif
 

+    @if($activity->entity && !is_null($activity->entity->deleted_at))
+        "{{ $activity->entity->name }}"
+    @endif
+

     @if($activity->extra) "{{ $activity->extra }}" @endif
 
     <br>
     @if($activity->extra) "{{ $activity->extra }}" @endif
 
     <br>