Fixed occurances of altered titles in search results

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

diff --git a/app/Entities/Models/BookChild.php b/app/Entities/Models/BookChild.php
index 8b968cc8b8d8268ae755bbc79ad42bd24419031e..e1ba0b6f708d75a18f5cb38dc38262e7396d61c0 100644 (file)
--- a/app/Entities/Models/BookChild.php
+++ b/app/Entities/Models/BookChild.php
@@ -1,23 +1,38 @@
-<?php namespace BookStack\Entities\Models;
+<?php
+
+namespace BookStack\Entities\Models;

 
 

-use BookStack\Entities\Models\Chapter;
-use BookStack\Entities\Models\Entity;
-use BookStack\Entities\Models\Book;

 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**

- * Class BookChild
- * @property int $book_id
- * @property int $priority
- * @property Book $book
+ * Class BookChild.
+ *
+ * @property int    $book_id
+ * @property int    $priority
+ * @property string $book_slug
+ * @property Book   $book
+ *

  * @method Builder whereSlugs(string $bookSlug, string $childSlug)
  */
 abstract class BookChild extends Entity
 {
  * @method Builder whereSlugs(string $bookSlug, string $childSlug)
  */
 abstract class BookChild extends Entity
 {

+    protected static function boot()
+    {
+        parent::boot();
+
+        // Load book slugs onto these models by default during query-time
+        static::addGlobalScope('book_slug', function (Builder $builder) {
+            $builder->addSelect(['book_slug' => function ($builder) {
+                $builder->select('slug')
+                    ->from('books')
+                    ->whereColumn('books.id', '=', 'book_id');
+            }]);
+        });
+    }

 
     /**
 
     /**

-     * Scope a query to find items where the the child has the given childSlug
+     * Scope a query to find items where the child has the given childSlug

      * where its parent has the bookSlug.
      */
     public function scopeWhereSlugs(Builder $query, string $bookSlug, string $childSlug)
      * where its parent has the bookSlug.
      */
     public function scopeWhereSlugs(Builder $query, string $bookSlug, string $childSlug)


@@ -49,7 +64,7 @@ abstract class BookChild extends Entity
 
         // Update all child pages if a chapter
         if ($this instanceof Chapter) {
 
         // Update all child pages if a chapter
         if ($this instanceof Chapter) {

-            foreach ($this->pages as $page) {
+            foreach ($this->pages()->withTrashed()->get() as $page) {

                 $page->changeBook($newBookId);
             }
         }
                 $page->changeBook($newBookId);
             }
         }