X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/c429cf78187e80deb63982a282a1c6889f30291a..refs/pull/3032/head:/app/Entities/Models/Page.php diff --git a/app/Entities/Models/Page.php b/app/Entities/Models/Page.php index 123600539..601e9630d 100644 --- a/app/Entities/Models/Page.php +++ b/app/Entities/Models/Page.php @@ -25,9 +25,10 @@ use Permissions; */ class Page extends BookChild { - protected $fillable = ['name', 'priority', 'markdown']; + public static $listAttributes = ['name', 'id', 'slug', 'book_id', 'chapter_id', 'draft', 'template', 'text', 'created_at', 'updated_at', 'priority']; + public static $contentAttributes = ['name', 'id', 'slug', 'book_id', 'chapter_id', 'draft', 'template', 'html', 'text', 'created_at', 'updated_at', 'priority']; - protected $simpleAttributes = ['name', 'id', 'slug']; + protected $fillable = ['name', 'priority']; public $textField = 'text'; @@ -48,19 +49,6 @@ class Page extends BookChild return parent::scopeVisible($query); } - /** - * Converts this page into a simplified array. - * - * @return mixed - */ - public function toSimpleArray() - { - $array = array_intersect_key($this->toArray(), array_flip($this->simpleAttributes)); - $array['url'] = $this->getUrl(); - - return $array; - } - /** * Get the chapter that this page is in, If applicable. * @@ -119,7 +107,7 @@ class Page extends BookChild { $parts = [ 'books', - urlencode($this->getAttribute('bookSlug') ?? $this->book->slug), + urlencode($this->book_slug ?? $this->book->slug), $this->draft ? 'draft' : 'page', $this->draft ? $this->id : urlencode($this->slug), trim($path, '/'),