Guest create page: name field autofocus

[bookstack] / app / Uploads / ImageRepo.php

diff --git a/app/Uploads/ImageRepo.php b/app/Uploads/ImageRepo.php
index 5c6228b378df9b6bb35962eb05dcf1684c9d97bf..8770402adbdb0abe465a9fb866bedb932bf3cf32 100644 (file)
--- a/app/Uploads/ImageRepo.php
+++ b/app/Uploads/ImageRepo.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Uploads;
 
 
 namespace BookStack\Uploads;
 

-use BookStack\Auth\Permissions\PermissionService;
+use BookStack\Auth\Permissions\PermissionApplicator;

 use BookStack\Entities\Models\Page;
 use BookStack\Exceptions\ImageUploadException;
 use Exception;
 use BookStack\Entities\Models\Page;
 use BookStack\Exceptions\ImageUploadException;
 use Exception;


@@ -11,16 +11,16 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class ImageRepo
 {
 
 class ImageRepo
 {

-    protected $imageService;
-    protected $restrictionService;
+    protected ImageService $imageService;
+    protected PermissionApplicator $permissions;

 
     /**
      * ImageRepo constructor.
      */
 
     /**
      * ImageRepo constructor.
      */

-    public function __construct(ImageService $imageService, PermissionService $permissionService)
+    public function __construct(ImageService $imageService, PermissionApplicator $permissions)

     {
         $this->imageService = $imageService;
     {
         $this->imageService = $imageService;

-        $this->restrictionService = $permissionService;
+        $this->permissions = $permissions;

     }
 
     /**
     }
 
     /**


@@ -74,7 +74,7 @@ class ImageRepo
         }
 
         // Filter by page access
         }
 
         // Filter by page access

-        $imageQuery = $this->restrictionService->filterRelatedEntity(Page::class, $imageQuery, 'images', 'uploaded_to');
+        $imageQuery = $this->permissions->restrictPageRelationQuery($imageQuery, 'images', 'uploaded_to');

 
         if ($whereClause !== null) {
             $imageQuery = $imageQuery->where($whereClause);
 
         if ($whereClause !== null) {
             $imageQuery = $imageQuery->where($whereClause);


@@ -103,7 +103,10 @@ class ImageRepo
                 if ($filterType === 'page') {
                     $query->where('uploaded_to', '=', $contextPage->id);
                 } elseif ($filterType === 'book') {
                 if ($filterType === 'page') {
                     $query->where('uploaded_to', '=', $contextPage->id);
                 } elseif ($filterType === 'book') {

-                    $validPageIds = $contextPage->book->pages()->visible()->get(['id'])->pluck('id')->toArray();
+                    $validPageIds = $contextPage->book->pages()
+                        ->scopes('visible')
+                        ->pluck('id')
+                        ->toArray();

                     $query->whereIn('uploaded_to', $validPageIds);
                 }
             };
                     $query->whereIn('uploaded_to', $validPageIds);
                 }
             };


@@ -236,7 +239,7 @@ class ImageRepo
             ->get(['id', 'name', 'slug', 'book_id']);
 
         foreach ($pages as $page) {
             ->get(['id', 'name', 'slug', 'book_id']);
 
         foreach ($pages as $page) {

-            $page->url = $page->getUrl();
+            $page->setAttribute('url', $page->getUrl());

         }
 
         return $pages->all();
         }
 
         return $pages->all();