Added deletion of revisions on page delete

[bookstack] / app / Http / Controllers / PageController.php

diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index 67d28a78a45ec388f15444de7621d3d3d29c2105..134c22081382bdd0a3a407b469bd7684ccb9c4d0 100644 (file)
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -1,12 +1,13 @@
 <?php namespace BookStack\Http\Controllers;
 
 <?php namespace BookStack\Http\Controllers;
 

+use BookStack\Actions\View;

 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Entities\Tools\PageEditActivity;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Entities\Tools\PageEditActivity;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Repos\PageRepo;

+use BookStack\Entities\Tools\PermissionsUpdater;

 use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\NotFoundException;

-use BookStack\Exceptions\NotifyException;

 use BookStack\Exceptions\PermissionsException;
 use Exception;
 use Illuminate\Http\Request;
 use BookStack\Exceptions\PermissionsException;
 use Exception;
 use Illuminate\Http\Request;


@@ -141,7 +142,7 @@ class PageController extends Controller
             $page->load(['comments.createdBy']);
         }
 
             $page->load(['comments.createdBy']);
         }
 

-        Views::add($page);
+        View::incrementFor($page);

         $this->setPageTitle($page->getShortName());
         return view('pages.show', [
             'page' => $page,
         $this->setPageTitle($page->getShortName());
         return view('pages.show', [
             'page' => $page,


@@ -294,7 +295,6 @@ class PageController extends Controller
      * Remove the specified page from storage.
      * @throws NotFoundException
      * @throws Throwable
      * Remove the specified page from storage.
      * @throws NotFoundException
      * @throws Throwable

-     * @throws NotifyException

      */
     public function destroy(string $bookSlug, string $pageSlug)
     {
      */
     public function destroy(string $bookSlug, string $pageSlug)
     {


@@ -310,7 +310,6 @@ class PageController extends Controller
     /**
      * Remove the specified draft page from storage.
      * @throws NotFoundException
     /**
      * Remove the specified draft page from storage.
      * @throws NotFoundException

-     * @throws NotifyException

      * @throws Throwable
      */
     public function destroyDraft(string $bookSlug, int $pageId)
      * @throws Throwable
      */
     public function destroyDraft(string $bookSlug, int $pageId)


@@ -339,9 +338,9 @@ class PageController extends Controller
             ->paginate(20)
             ->setPath(url('/pages/recently-updated'));
 
             ->paginate(20)
             ->setPath(url('/pages/recently-updated'));
 

-        return view('pages.detailed-listing', [
+        return view('common.detailed-listing-paginated', [

             'title' => trans('entities.recently_updated_pages'),
             'title' => trans('entities.recently_updated_pages'),

-            'pages' => $pages
+            'entities' => $pages

         ]);
     }
 
         ]);
     }
 


@@ -453,14 +452,12 @@ class PageController extends Controller
      * @throws NotFoundException
      * @throws Throwable
      */
      * @throws NotFoundException
      * @throws Throwable
      */

-    public function permissions(Request $request, string $bookSlug, string $pageSlug)
+    public function permissions(Request $request, PermissionsUpdater $permissionsUpdater, string $bookSlug, string $pageSlug)

     {
         $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
         $this->checkOwnablePermission('restrictions-manage', $page);
 
     {
         $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
         $this->checkOwnablePermission('restrictions-manage', $page);
 

-        $restricted = $request->get('restricted') === 'true';
-        $permissions = $request->filled('restrictions') ? collect($request->get('restrictions')) : null;
-        $this->pageRepo->updatePermissions($page, $restricted, $permissions);
+        $permissionsUpdater->updateFromPermissionsForm($page, $request);

 
         $this->showSuccessNotification(trans('entities.pages_permissions_success'));
         return redirect($page->getUrl());
 
         $this->showSuccessNotification(trans('entities.pages_permissions_success'));
         return redirect($page->getUrl());