Page Attachments - Improved UI, Now initially complete

[bookstack] / app / PageRevision.php

diff --git a/app/PageRevision.php b/app/PageRevision.php
index 1baf0f8e5833c60801ad1ffeb193cf06c6e5f1d4..ff469f0ed3a78b3d3750c3ff6d07b6b2d787c226 100644 (file)
--- a/app/PageRevision.php
+++ b/app/PageRevision.php
@@ -3,7 +3,7 @@
 
 class PageRevision extends Model
 {
-    protected $fillable = ['name', 'html', 'text', 'markdown'];
+    protected $fillable = ['name', 'html', 'text', 'markdown', 'summary'];
 
     /**
      * Get the user that created the page revision
@@ -25,32 +25,26 @@ class PageRevision extends Model
 
     /**
      * Get the url for this revision.
+     * @param null|string $path
      * @return string
      */
-    public function getUrl()
+    public function getUrl($path = null)
     {
-        return $this->page->getUrl() . '/revisions/' . $this->id;
+        $url = $this->page->getUrl() . '/revisions/' . $this->id;
+        if ($path) return $url . '/' . trim($path, '/');
+        return $url;
     }
 
     /**
-     * Get previous revision
-     * @return \BookStack\PageRevision
+     * Get the previous revision for the same page if existing
+     * @return \BookStack\PageRevision|null
      */
     public function getPrevious()
     {
-        if ($id = PageRevision::where('id', '<', $this->id)->max('id')) {
-            return PageRevision::find($id);
+        if ($id = static::where('page_id', '=', $this->page_id)->where('id', '<', $this->id)->max('id')) {
+            return static::find($id);
         }
+        return null;
     }
 
-    /**
-     * Get next revision
-     * @return \BookStack\PageRevision
-     */
-    public function getNext()
-    {
-        if ($id = PageRevision::where('id', '>', $this->id)->min('id')) {
-            return PageRevision::find($id);
-        }
-    }
 }