Page Attachments - Improved UI, Now initially complete

[bookstack] / app / Page.php

diff --git a/app/Page.php b/app/Page.php
index feedb1eae85812b27d814582cbd4e061de73faf6..94bcce2b590d104a905b0da0be36e934d8156258 100644 (file)
--- a/app/Page.php
+++ b/app/Page.php
@@ -1,15 +1,16 @@
-<?php
+<?php namespace BookStack;

 
 

-namespace BookStack;
-
-use Illuminate\Database\Eloquent\Model;

 
 class Page extends Entity
 {
 
 class Page extends Entity
 {

-    protected $fillable = ['name', 'html', 'priority'];
+    protected $fillable = ['name', 'html', 'priority', 'markdown'];

 
     protected $simpleAttributes = ['name', 'id', 'slug'];
 
 
     protected $simpleAttributes = ['name', 'id', 'slug'];
 

+    /**
+     * Converts this page into a simplified array.
+     * @return mixed
+     */

     public function toSimpleArray()
     {
         $array = array_intersect_key($this->toArray(), array_flip($this->simpleAttributes));
     public function toSimpleArray()
     {
         $array = array_intersect_key($this->toArray(), array_flip($this->simpleAttributes));


@@ -17,37 +18,78 @@ class Page extends Entity
         return $array;
     }
 
         return $array;
     }
 

+    /**
+     * Get the book this page sits in.
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */

     public function book()
     {
     public function book()
     {

-        return $this->belongsTo('BookStack\Book');
+        return $this->belongsTo(Book::class);

     }
 
     }
 

+    /**
+     * Get the chapter that this page is in, If applicable.
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */

     public function chapter()
     {
     public function chapter()
     {

-        return $this->belongsTo('BookStack\Chapter');
+        return $this->belongsTo(Chapter::class);

     }
 
     }
 

+    /**
+     * Check if this page has a chapter.
+     * @return bool
+     */

     public function hasChapter()
     {
         return $this->chapter()->count() > 0;
     }
 
     public function hasChapter()
     {
         return $this->chapter()->count() > 0;
     }
 

-
+    /**
+     * Get the associated page revisions, ordered by created date.
+     * @return mixed
+     */

     public function revisions()
     {
     public function revisions()
     {

-        return $this->hasMany('BookStack\PageRevision')->orderBy('created_at', 'desc');
+        return $this->hasMany(PageRevision::class)->where('type', '=', 'version')->orderBy('created_at', 'desc');

     }
 
     }
 

-    public function getUrl()
+    /**
+     * Get the files attached to this page.
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function files()
+    {
+        return $this->hasMany(File::class, 'uploaded_to')->orderBy('order', 'asc');
+    }
+
+    /**
+     * Get the url for this page.
+     * @param string|bool $path
+     * @return string
+     */
+    public function getUrl($path = false)

     {
     {

-        // TODO - Extract this and share with chapters

         $bookSlug = $this->getAttribute('bookSlug') ? $this->getAttribute('bookSlug') : $this->book->slug;
         $bookSlug = $this->getAttribute('bookSlug') ? $this->getAttribute('bookSlug') : $this->book->slug;

-        return '/books/' . $bookSlug . '/page/' . $this->slug;
+        $midText = $this->draft ? '/draft/' : '/page/';
+        $idComponent = $this->draft ? $this->id : $this->slug;
+
+        if ($path !== false) {
+            return baseUrl('/books/' . $bookSlug . $midText . $idComponent . '/' . trim($path, '/'));
+        }
+
+        return baseUrl('/books/' . $bookSlug . $midText . $idComponent);

     }
 
     }
 

+    /**
+     * Get an excerpt of this page's content to the specified length.
+     * @param int $length
+     * @return mixed
+     */

     public function getExcerpt($length = 100)
     {
     public function getExcerpt($length = 100)
     {

-        return strlen($this->text) > $length ? substr($this->text, 0, $length-3) . '...' : $this->text;
+        $text = strlen($this->text) > $length ? substr($this->text, 0, $length-3) . '...' : $this->text;
+        return mb_convert_encoding($text, 'UTF-8');

     }
 
 }
     }
 
 }