Allow toggling between grid and list view in shelf view (shelves.show)

[bookstack] / app / Entities / PageRevision.php

diff --git a/app/Entities/PageRevision.php b/app/Entities/PageRevision.php
index 502a71588134ebdb02960213d3e9800da6394fef..13dc713ba43be37453ca525f06e91f143793476e 100644 (file)
--- a/app/Entities/PageRevision.php
+++ b/app/Entities/PageRevision.php
@@ -1,9 +1,22 @@
 <?php namespace BookStack\Entities;
 
 <?php namespace BookStack\Entities;
 

-use BookStack\Entities\Page;
-use BookStack\Model;

 use BookStack\Auth\User;
 use BookStack\Auth\User;

+use BookStack\Model;
+use Carbon\Carbon;

 
 

+/**
+ * Class PageRevision
+ * @property int $page_id
+ * @property string $slug
+ * @property string $book_slug
+ * @property int $created_by
+ * @property Carbon $created_at
+ * @property string $type
+ * @property string $summary
+ * @property string $markdown
+ * @property string $html
+ * @property int $revision_number
+ */

 class PageRevision extends Model
 {
     protected $fillable = ['name', 'html', 'text', 'markdown', 'summary'];
 class PageRevision extends Model
 {
     protected $fillable = ['name', 'html', 'text', 'markdown', 'summary'];


@@ -42,13 +55,18 @@ class PageRevision extends Model
 
     /**
      * Get the previous revision for the same page if existing
 
     /**
      * Get the previous revision for the same page if existing

-     * @return \BookStack\PageRevision|null
+     * @return \BookStack\Entities\PageRevision|null

      */
     public function getPrevious()
     {
      */
     public function getPrevious()
     {

-        if ($id = static::where('page_id', '=', $this->page_id)->where('id', '<', $this->id)->max('id')) {
-            return static::find($id);
+        $id = static::newQuery()->where('page_id', '=', $this->page_id)
+            ->where('id', '<', $this->id)
+            ->max('id');
+
+        if ($id) {
+            return static::query()->find($id);

         }
         }

+

         return null;
     }
 
         return null;
     }