Guest create page: name field autofocus

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

diff --git a/app/Entities/Models/BookChild.php b/app/Entities/Models/BookChild.php
index 263eceb58a4b15ee8a0fb767cbb66ac98d31386f..ed08f16e6ac9783be4581e87b33a1af651c5cffa 100644 (file)
--- a/app/Entities/Models/BookChild.php
+++ b/app/Entities/Models/BookChild.php
@@ -2,35 +2,36 @@
 
 namespace BookStack\Entities\Models;
 
 
 namespace BookStack\Entities\Models;
 

+use BookStack\References\ReferenceUpdater;

 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**
  * Class BookChild.
  *
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**
  * Class BookChild.
  *

- * @property int  $book_id
- * @property int  $priority
- * @property string  $book_slug
- * @property Book $book
+ * @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
     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) {
+        static::addGlobalScope('book_slug', function (Builder $builder) {
+            $builder->addSelect(['book_slug' => function ($builder) {

                 $builder->select('slug')
                     ->from('books')
                 $builder->select('slug')
                     ->from('books')

-                    ->whereColumn('books.id', '=',  'book_id');
+                    ->whereColumn('books.id', '=', 'book_id');

             }]);
         });
     }
             }]);
         });
     }

+

     /**
      * Scope a query to find items where the child has the given childSlug
      * where its parent has the bookSlug.
     /**
      * Scope a query to find items where the child has the given childSlug
      * where its parent has the bookSlug.


@@ -57,11 +58,16 @@ abstract class BookChild extends Entity
      */
     public function changeBook(int $newBookId): Entity
     {
      */
     public function changeBook(int $newBookId): Entity
     {

+        $oldUrl = $this->getUrl();

         $this->book_id = $newBookId;
         $this->refreshSlug();
         $this->save();
         $this->refresh();
 
         $this->book_id = $newBookId;
         $this->refreshSlug();
         $this->save();
         $this->refresh();
 

+        if ($oldUrl !== $this->getUrl()) {
+            app()->make(ReferenceUpdater::class)->updateEntityPageReferences($this, $oldUrl);
+        }
+

         // Update all child pages if a chapter
         if ($this instanceof Chapter) {
             foreach ($this->pages()->withTrashed()->get() as $page) {
         // Update all child pages if a chapter
         if ($this instanceof Chapter) {
             foreach ($this->pages()->withTrashed()->get() as $page) {