X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/07b889547d28e68e5fc8f923c166bd607da17ad7..refs/pull/2023/head:/app/Entities/Chapter.php diff --git a/app/Entities/Chapter.php b/app/Entities/Chapter.php index bdacb7c9d..848bc6448 100644 --- a/app/Entities/Chapter.php +++ b/app/Entities/Chapter.php @@ -1,29 +1,18 @@ $pages + * @package BookStack\Entities + */ +class Chapter extends BookChild { public $searchFactor = 1.3; protected $fillable = ['name', 'description', 'priority', 'book_id']; - /** - * Get the morph class for this model. - * @return string - */ - public function getMorphClass() - { - return 'BookStack\\Chapter'; - } - - /** - * Get the book this chapter is within. - * @return \Illuminate\Database\Eloquent\Relations\BelongsTo - */ - public function book() - { - return $this->belongsTo(Book::class); - } - /** * Get the pages that this chapter contains. * @param string $dir @@ -42,10 +31,13 @@ class Chapter extends Entity public function getUrl($path = false) { $bookSlug = $this->getAttribute('bookSlug') ? $this->getAttribute('bookSlug') : $this->book->slug; + $fullPath = '/books/' . urlencode($bookSlug) . '/chapter/' . urlencode($this->slug); + if ($path !== false) { - return baseUrl('/books/' . urlencode($bookSlug) . '/chapter/' . urlencode($this->slug) . '/' . trim($path, '/')); + $fullPath .= '/' . trim($path, '/'); } - return baseUrl('/books/' . urlencode($bookSlug) . '/chapter/' . urlencode($this->slug)); + + return url($fullPath); } /** @@ -56,24 +48,26 @@ class Chapter extends Entity public function getExcerpt(int $length = 100) { $description = $this->text ?? $this->description; - return strlen($description) > $length ? substr($description, 0, $length-3) . '...' : $description; + return mb_strlen($description) > $length ? mb_substr($description, 0, $length-3) . '...' : $description; } /** - * Return a generalised, common raw query that can be 'unioned' across entities. - * @return string + * Check if this chapter has any child pages. + * @return bool */ - public function entityRawQuery() + public function hasChildren() { - return "'BookStack\\\\Chapter' as entity_type, id, id as entity_id, slug, name, {$this->textField} as text, '' as html, book_id, priority, '0' as chapter_id, '0' as draft, created_by, updated_by, updated_at, created_at"; + return count($this->pages) > 0; } /** - * Check if this chapter has any child pages. - * @return bool + * Get the visible pages in this chapter. */ - public function hasChildren() + public function getVisiblePages(): Collection { - return count($this->pages) > 0; + return $this->pages()->visible() + ->orderBy('draft', 'desc') + ->orderBy('priority', 'asc') + ->get(); } }