Improve sorting Shelf Books

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

diff --git a/app/Entities/Models/Page.php b/app/Entities/Models/Page.php
index b0a3e2d3185143a9265e6079c3b615e88e5579a6..739927aff6dad8561672a5687d504d18848079ee 100644 (file)
--- a/app/Entities/Models/Page.php
+++ b/app/Entities/Models/Page.php
@@ -1,5 +1,6 @@
 <?php namespace BookStack\Entities\Models;
 
 <?php namespace BookStack\Entities\Models;
 

+use BookStack\Entities\Tools\PageContent;

 use BookStack\Uploads\Attachment;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use BookStack\Uploads\Attachment;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;


@@ -27,7 +28,7 @@ class Page extends BookChild
 
     public $textField = 'text';
 
 
     public $textField = 'text';
 

-    protected $hidden = ['html', 'markdown', 'text', 'restricted', 'pivot'];
+    protected $hidden = ['html', 'markdown', 'text', 'restricted', 'pivot', 'deleted_at'];

 
     protected $casts = [
         'draft' => 'boolean',
 
     protected $casts = [
         'draft' => 'boolean',


@@ -114,4 +115,15 @@ class Page extends BookChild
     {
         return $this->revisions()->first();
     }
     {
         return $this->revisions()->first();
     }

+
+    /**
+     * Get this page for JSON display.
+     */
+    public function forJsonDisplay(): Page
+    {
+        $refreshed = $this->refresh()->unsetRelations()->load(['tags', 'createdBy', 'updatedBy', 'ownedBy']);
+        $refreshed->setHidden(array_diff($refreshed->getHidden(), ['html', 'markdown']));
+        $refreshed->html = (new PageContent($refreshed))->render();
+        return $refreshed;
+    }

 }
 }