Skip intermediate login page with single provider

[bookstack] / app / Entities / Models / Chapter.php

diff --git a/app/Entities/Models/Chapter.php b/app/Entities/Models/Chapter.php
index fd818b703736b9fe9e7bacd0f67fc5848e94a47c..af4bbd8e3a66238d722272358086aa45f4aa970d 100644 (file)
--- a/app/Entities/Models/Chapter.php
+++ b/app/Entities/Models/Chapter.php
@@ -2,29 +2,31 @@
 
 namespace BookStack\Entities\Models;
 
 
 namespace BookStack\Entities\Models;
 

+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\HasMany;

 use Illuminate\Support\Collection;
 
 /**
  * Class Chapter.
  *
  * @property Collection<Page> $pages
 use Illuminate\Support\Collection;
 
 /**
  * Class Chapter.
  *
  * @property Collection<Page> $pages

- * @property mixed description
+ * @property string           $description

  */
 class Chapter extends BookChild
 {
  */
 class Chapter extends BookChild
 {

-    public $searchFactor = 1.3;
+    use HasFactory;

 
 

-    protected $fillable = ['name', 'description', 'priority', 'book_id'];
+    public $searchFactor = 1.2;
+
+    protected $fillable = ['name', 'description', 'priority'];

     protected $hidden = ['restricted', 'pivot', 'deleted_at'];
 
     /**
      * Get the pages that this chapter contains.
      *
     protected $hidden = ['restricted', 'pivot', 'deleted_at'];
 
     /**
      * Get the pages that this chapter contains.
      *

-     * @param string $dir
-     *
-     * @return mixed
+     * @return HasMany<Page>

      */
      */

-    public function pages($dir = 'ASC')
+    public function pages(string $dir = 'ASC'): HasMany

     {
         return $this->hasMany(Page::class)->orderBy('priority', $dir);
     }
     {
         return $this->hasMany(Page::class)->orderBy('priority', $dir);
     }


@@ -32,11 +34,11 @@ class Chapter extends BookChild
     /**
      * Get the url of this chapter.
      */
     /**
      * Get the url of this chapter.
      */

-    public function getUrl($path = ''): string
+    public function getUrl(string $path = ''): string

     {
         $parts = [
             'books',
     {
         $parts = [
             'books',

-            urlencode($this->getAttribute('bookSlug') ?? $this->book->slug),
+            urlencode($this->book_slug ?? $this->book->slug),

             'chapter',
             urlencode($this->slug),
             trim($path, '/'),
             'chapter',
             urlencode($this->slug),
             trim($path, '/'),


@@ -50,7 +52,8 @@ class Chapter extends BookChild
      */
     public function getVisiblePages(): Collection
     {
      */
     public function getVisiblePages(): Collection
     {

-        return $this->pages()->visible()
+        return $this->pages()
+        ->scopes('visible')

         ->orderBy('draft', 'desc')
         ->orderBy('priority', 'asc')
         ->get();
         ->orderBy('draft', 'desc')
         ->orderBy('priority', 'asc')
         ->get();