Guest create page: name field autofocus

[bookstack] / app / Console / Commands / CopyShelfPermissions.php

diff --git a/app/Console/Commands/CopyShelfPermissions.php b/app/Console/Commands/CopyShelfPermissions.php
index d220c59f9ea7cedbf0a77c6e6ccb3bab27d7496e..ec4c875ffa97d3935d0101383559d7ff63508c54 100644 (file)
--- a/app/Console/Commands/CopyShelfPermissions.php
+++ b/app/Console/Commands/CopyShelfPermissions.php
@@ -3,7 +3,7 @@
 namespace BookStack\Console\Commands;
 
 use BookStack\Entities\Models\Bookshelf;
 namespace BookStack\Console\Commands;
 
 use BookStack\Entities\Models\Bookshelf;

-use BookStack\Entities\Repos\BookshelfRepo;
+use BookStack\Entities\Tools\PermissionsUpdater;

 use Illuminate\Console\Command;
 
 class CopyShelfPermissions extends Command
 use Illuminate\Console\Command;
 
 class CopyShelfPermissions extends Command


@@ -25,19 +25,16 @@ class CopyShelfPermissions extends Command
      */
     protected $description = 'Copy shelf permissions to all child books';
 
      */
     protected $description = 'Copy shelf permissions to all child books';
 

-    /**
-     * @var BookshelfRepo
-     */
-    protected $bookshelfRepo;
+    protected PermissionsUpdater $permissionsUpdater;

 
     /**
      * Create a new command instance.
      *
      * @return void
      */
 
     /**
      * Create a new command instance.
      *
      * @return void
      */

-    public function __construct(BookshelfRepo $repo)
+    public function __construct(PermissionsUpdater $permissionsUpdater)

     {
     {

-        $this->bookshelfRepo = $repo;
+        $this->permissionsUpdater = $permissionsUpdater;

         parent::__construct();
     }
 
         parent::__construct();
     }
 


@@ -54,13 +51,14 @@ class CopyShelfPermissions extends Command
 
         if (!$cascadeAll && !$shelfSlug) {
             $this->error('Either a --slug or --all option must be provided.');
 
         if (!$cascadeAll && !$shelfSlug) {
             $this->error('Either a --slug or --all option must be provided.');

+

             return;
         }
 
         if ($cascadeAll) {
             $continue = $this->confirm(
             return;
         }
 
         if ($cascadeAll) {
             $continue = $this->confirm(

-                'Permission settings for all shelves will be cascaded. '.
-                        'Books assigned to multiple shelves will receive only the permissions of it\'s last processed shelf. '.
+                'Permission settings for all shelves will be cascaded. ' .
+                        'Books assigned to multiple shelves will receive only the permissions of it\'s last processed shelf. ' .

                         'Are you sure you want to proceed?'
             );
 
                         'Are you sure you want to proceed?'
             );
 


@@ -68,18 +66,18 @@ class CopyShelfPermissions extends Command
                 return;
             }
 
                 return;
             }
 

-            $shelves = Bookshelf::query()->get(['id', 'restricted']);
+            $shelves = Bookshelf::query()->get(['id']);

         }
 
         if ($shelfSlug) {
         }
 
         if ($shelfSlug) {

-            $shelves = Bookshelf::query()->where('slug', '=', $shelfSlug)->get(['id', 'restricted']);
+            $shelves = Bookshelf::query()->where('slug', '=', $shelfSlug)->get(['id']);

             if ($shelves->count() === 0) {
                 $this->info('No shelves found with the given slug.');
             }
         }
 
         foreach ($shelves as $shelf) {
             if ($shelves->count() === 0) {
                 $this->info('No shelves found with the given slug.');
             }
         }
 
         foreach ($shelves as $shelf) {

-            $this->bookshelfRepo->copyDownPermissions($shelf, false);
+            $this->permissionsUpdater->updateBookPermissionsFromShelf($shelf, false);

             $this->info('Copied permissions for shelf [' . $shelf->id . ']');
         }
 
             $this->info('Copied permissions for shelf [' . $shelf->id . ']');
         }