Fixed model extending mis-use

[bookstack] / app / Chapter.php

diff --git a/app/Chapter.php b/app/Chapter.php
index b7623798a5c67d9883238e941254601875bcc67e..b08cb913a425808fdd25ba5d7c16b4711f79d906 100644 (file)
--- a/app/Chapter.php
+++ b/app/Chapter.php
@@ -1,40 +1,63 @@
-<?php namespace Oxbow;
+<?php namespace BookStack;

 
 

-use Illuminate\Database\Eloquent\Model;

 
 

-class Chapter extends Model
+class Chapter extends Entity

 {
 {

-

     protected $fillable = ['name', 'description', 'priority', 'book_id'];
 
     protected $fillable = ['name', 'description', 'priority', 'book_id'];
 

-    public function book()
-    {
-        return $this->belongsTo('Oxbow\Book');
-    }
+    protected $with = ['book'];

 
 

-    public function pages()
+    /**
+     * Get the book this chapter is within.
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function book()

     {
     {

-        return $this->hasMany('Oxbow\Page')->orderBy('priority', 'ASC');
+        return $this->belongsTo(Book::class);

     }
 
     }
 

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

     {
     {

-        return $this->belongsTo('Oxbow\User', 'created_by');
+        return $this->hasMany(Page::class)->orderBy('priority', $dir);

     }
 
     }
 

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

     {
     {

-        return $this->belongsTo('Oxbow\User', 'updated_by');
+        $bookSlug = $this->getAttribute('bookSlug') ? $this->getAttribute('bookSlug') : $this->book->slug;
+        if ($path !== false) {
+            return baseUrl('/books/' . urlencode($bookSlug) . '/chapter/' . urlencode($this->slug) . '/' . trim($path, '/'));
+        }
+        return baseUrl('/books/' . urlencode($bookSlug) . '/chapter/' . urlencode($this->slug));

     }
 
     }
 

-    public function getUrl()
+    /**
+     * Get an excerpt of this chapter's description to the specified length or less.
+     * @param int $length
+     * @return string
+     */
+    public function getExcerpt($length = 100)

     {
     {

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

     }
 
     }
 

-    public function getExcerpt($length = 100)
+    /**
+     * Return a generalised, common raw query that can be 'unioned' across entities.
+     * @return string
+     */
+    public function entityRawQuery()

     {
     {

-        return strlen($this->description) > $length ? substr($this->description, 0, $length-3) . '...' : $this->description;
+        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";

     }
 
 }
     }
 
 }