X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/fff5bbcee458992443e3732fbcbbbe34f765fcc3..refs/pull/435/head:/app/Chapter.php diff --git a/app/Chapter.php b/app/Chapter.php index 8f0453172..b08cb913a 100644 --- a/app/Chapter.php +++ b/app/Chapter.php @@ -5,6 +5,8 @@ class Chapter extends Entity { protected $fillable = ['name', 'description', 'priority', 'book_id']; + protected $with = ['book']; + /** * Get the book this chapter is within. * @return \Illuminate\Database\Eloquent\Relations\BelongsTo @@ -16,11 +18,12 @@ class Chapter extends Entity /** * Get the pages that this chapter contains. + * @param string $dir * @return mixed */ - public function pages() + public function pages($dir = 'ASC') { - return $this->hasMany(Page::class)->orderBy('priority', 'ASC'); + return $this->hasMany(Page::class)->orderBy('priority', $dir); } /** @@ -32,9 +35,9 @@ class Chapter extends Entity { $bookSlug = $this->getAttribute('bookSlug') ? $this->getAttribute('bookSlug') : $this->book->slug; if ($path !== false) { - return baseUrl('/books/' . $bookSlug. '/chapter/' . $this->slug . '/' . trim($path, '/')); + return baseUrl('/books/' . urlencode($bookSlug) . '/chapter/' . urlencode($this->slug) . '/' . trim($path, '/')); } - return baseUrl('/books/' . $bookSlug. '/chapter/' . $this->slug); + return baseUrl('/books/' . urlencode($bookSlug) . '/chapter/' . urlencode($this->slug)); } /** @@ -48,4 +51,13 @@ class Chapter extends Entity return strlen($description) > $length ? substr($description, 0, $length-3) . '...' : $description; } + /** + * Return a generalised, common raw query that can be 'unioned' across entities. + * @return string + */ + public function entityRawQuery() + { + 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"; + } + }