Guest create page: name field autofocus

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

diff --git a/app/Entities/Models/Deletion.php b/app/Entities/Models/Deletion.php
index dab89ce37427e82d372ced42cc5bcd2090322e89..25f0ea6db7f84478fe2e7d30fe45c1145ab5c55b 100644 (file)
--- a/app/Entities/Models/Deletion.php
+++ b/app/Entities/Models/Deletion.php
@@ -3,16 +3,23 @@
 namespace BookStack\Entities\Models;
 
 use BookStack\Auth\User;
 namespace BookStack\Entities\Models;
 
 use BookStack\Auth\User;

+use BookStack\Interfaces\Deletable;

 use BookStack\Interfaces\Loggable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 /**
 use BookStack\Interfaces\Loggable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 /**

- * @property Model deletable
+ * @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.
      */


@@ -22,7 +29,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
     {


@@ -48,13 +55,17 @@ class Deletion extends Model implements Loggable
     {
         $deletable = $this->deletable()->first();
 
     {
         $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.
      */
     }
 
     /**
      * Get a URL for this specific deletion.
      */

-    public function getUrl($path): string
+    public function getUrl(string $path = 'restore'): string

     {
         return url("/settings/recycle-bin/{$this->id}/" . ltrim($path, '/'));
     }
     {
         return url("/settings/recycle-bin/{$this->id}/" . ltrim($path, '/'));
     }