Updated issue template and added TinyMCE autolinking

[bookstack] / app / Chapter.php

diff --git a/app/Chapter.php b/app/Chapter.php
index b6c8684a00069de44dc1341d77da27cc45410cd4..dc23f5ebdbd015fbab800084baf3066ab66d1a59 100644 (file)
--- a/app/Chapter.php
+++ b/app/Chapter.php
@@ -5,25 +5,50 @@ class Chapter extends Entity
 {
     protected $fillable = ['name', 'description', 'priority', 'book_id'];
 
 {
     protected $fillable = ['name', 'description', 'priority', 'book_id'];
 

+    protected $with = ['book'];
+
+    /**
+     * Get the book this chapter is within.
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */

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

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

     }
 
     }
 

-    public function pages()
+    /**
+     * Get the pages that this chapter contains.
+     * @param string $dir
+     * @return mixed
+     */
+    public function pages($dir = 'ASC')

     {
     {

-        return $this->hasMany('BookStack\Page')->orderBy('priority', 'ASC');
+        return $this->hasMany(Page::class)->orderBy('priority', $dir);

     }
 
     }
 

-    public function getUrl()
+    /**
+     * Get the url of this chapter.
+     * @param string|bool $path
+     * @return string
+     */
+    public function getUrl($path = false)

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

-        return '/books/' . $bookSlug. '/chapter/' . $this->slug;
+        if ($path !== false) {
+            return baseUrl('/books/' . urlencode($bookSlug) . '/chapter/' . urlencode($this->slug) . '/' . trim($path, '/'));
+        }
+        return baseUrl('/books/' . urlencode($bookSlug) . '/chapter/' . urlencode($this->slug));

     }
 
     }
 

+    /**
+     * Get an excerpt of this chapter's description to the specified length or less.
+     * @param int $length
+     * @return string
+     */

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

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

     }
 
 }
     }
 
 }