added routes for zip export

[bookstack] / app / Entities / Models / Deletion.php

diff --git a/app/Entities/Models/Deletion.php b/app/Entities/Models/Deletion.php
index 1be0ba4c678c17139cf1aa9ca2592f2ca0f692d7..a73437c94a4110bee1dd7f0c98501d09e18d4df4 100644 (file)
--- a/app/Entities/Models/Deletion.php
+++ b/app/Entities/Models/Deletion.php
@@ -1,14 +1,23 @@
-<?php namespace BookStack\Entities\Models;
+<?php

 
 

-use BookStack\Auth\User;
-use BookStack\Entities\Models\Entity;
-use BookStack\Interfaces\Loggable;
+namespace BookStack\Entities\Models;
+
+use BookStack\Activity\Models\Loggable;
+use BookStack\Users\Models\User;

 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 

+/**
+ * @property int       $id
+ * @property int       $deleted_by
+ * @property string    $deletable_type
+ * @property int       $deletable_id
+ * @property Deletable $deletable
+ */

 class Deletion extends Model implements Loggable
 {
 class Deletion extends Model implements Loggable
 {

+    protected $hidden = [];

 
     /**
      * Get the related deletable record.
 
     /**
      * Get the related deletable record.


@@ -19,7 +28,7 @@ class Deletion extends Model implements Loggable
     }
 
     /**
     }
 
     /**

-     * The the user that performed the deletion.
+     * Get the user that performed the deletion.

      */
     public function deleter(): BelongsTo
     {
      */
     public function deleter(): BelongsTo
     {


@@ -29,20 +38,34 @@ class Deletion extends Model implements Loggable
     /**
      * Create a new deletion record for the provided entity.
      */
     /**
      * Create a new deletion record for the provided entity.
      */

-    public static function createForEntity(Entity $entity): Deletion
+    public static function createForEntity(Entity $entity): self

     {
         $record = (new self())->forceFill([
     {
         $record = (new self())->forceFill([

-            'deleted_by' => user()->id,
+            'deleted_by'     => user()->id,

             'deletable_type' => $entity->getMorphClass(),
             'deletable_type' => $entity->getMorphClass(),

-            'deletable_id' => $entity->id,
+            'deletable_id'   => $entity->id,

         ]);
         $record->save();
         ]);
         $record->save();

+

         return $record;
     }
 
     public function logDescriptor(): string
     {
         $deletable = $this->deletable()->first();
         return $record;
     }
 
     public function logDescriptor(): string
     {
         $deletable = $this->deletable()->first();

-        return "Deletion ({$this->id}) for {$deletable->getType()} ({$deletable->id}) {$deletable->name}";
+
+        if ($deletable instanceof Entity) {
+            return "Deletion ({$this->id}) for {$deletable->getType()} ({$deletable->id}) {$deletable->name}";
+        }
+
+        return "Deletion ({$this->id})";
+    }
+
+    /**
+     * Get a URL for this specific deletion.
+     */
+    public function getUrl(string $path = 'restore'): string
+    {
+        return url("/settings/recycle-bin/{$this->id}/" . ltrim($path, '/'));

     }
 }
     }
 }