Fixed issue thrown upon empty markdown content save

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

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

-use Activity;
-use BookStack\Entities\Managers\BookContents;
-use BookStack\Entities\Managers\PageContent;
-use BookStack\Entities\Managers\PageEditActivity;
-use BookStack\Entities\Page;
+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\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;


@@ -26,7 +25,6 @@ class PageController extends Controller
     public function __construct(PageRepo $pageRepo)
     {
         $this->pageRepo = $pageRepo;
     public function __construct(PageRepo $pageRepo)
     {
         $this->pageRepo = $pageRepo;

-        parent::__construct();

     }
 
     /**
     }
 
     /**


@@ -78,7 +76,7 @@ class PageController extends Controller
     public function editDraft(string $bookSlug, int $pageId)
     {
         $draft = $this->pageRepo->getById($pageId);
     public function editDraft(string $bookSlug, int $pageId)
     {
         $draft = $this->pageRepo->getById($pageId);

-        $this->checkOwnablePermission('page-create', $draft->parent());
+        $this->checkOwnablePermission('page-create', $draft->getParent());

         $this->setPageTitle(trans('entities.pages_edit_draft'));
 
         $draftsEnabled = $this->isSignedIn();
         $this->setPageTitle(trans('entities.pages_edit_draft'));
 
         $draftsEnabled = $this->isSignedIn();


@@ -104,10 +102,9 @@ class PageController extends Controller
             'name' => 'required|string|max:255'
         ]);
         $draftPage = $this->pageRepo->getById($pageId);
             'name' => 'required|string|max:255'
         ]);
         $draftPage = $this->pageRepo->getById($pageId);

-        $this->checkOwnablePermission('page-create', $draftPage->parent());
+        $this->checkOwnablePermission('page-create', $draftPage->getParent());

 
         $page = $this->pageRepo->publishDraft($draftPage, $request->all());
 
         $page = $this->pageRepo->publishDraft($draftPage, $request->all());

-        Activity::add($page, 'page_create', $draftPage->book->id);

 
         return redirect($page->getUrl());
     }
 
         return redirect($page->getUrl());
     }


@@ -163,6 +160,8 @@ class PageController extends Controller
     public function getPageAjax(int $pageId)
     {
         $page = $this->pageRepo->getById($pageId);
     public function getPageAjax(int $pageId)
     {
         $page = $this->pageRepo->getById($pageId);

+        $page->setHidden(array_diff($page->getHidden(), ['html', 'markdown']));
+        $page->addHidden(['book']);

         return response()->json($page);
     }
 
         return response()->json($page);
     }
 


@@ -222,7 +221,6 @@ class PageController extends Controller
         $this->checkOwnablePermission('page-update', $page);
 
         $this->pageRepo->update($page, $request->all());
         $this->checkOwnablePermission('page-update', $page);
 
         $this->pageRepo->update($page, $request->all());

-        Activity::add($page, 'page_update', $page->book->id);

 
         return redirect($page->getUrl());
     }
 
         return redirect($page->getUrl());
     }


@@ -296,26 +294,21 @@ 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)
     {
         $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
         $this->checkOwnablePermission('page-delete', $page);
      */
     public function destroy(string $bookSlug, string $pageSlug)
     {
         $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
         $this->checkOwnablePermission('page-delete', $page);

+        $parent = $page->getParent();

 
 

-        $book = $page->book;
-        $parent = $page->chapter ?? $book;

         $this->pageRepo->destroy($page);
         $this->pageRepo->destroy($page);

-        Activity::addMessage('page_delete', $page->name, $book->id);

 
 

-        $this->showSuccessNotification(trans('entities.pages_delete_success'));

         return redirect($parent->getUrl());
     }
 
     /**
      * Remove the specified draft page from storage.
      * @throws NotFoundException
         return redirect($parent->getUrl());
     }
 
     /**
      * 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)


@@ -392,7 +385,6 @@ class PageController extends Controller
             return redirect()->back();
         }
 
             return redirect()->back();
         }
 

-        Activity::add($page, 'page_move', $page->book->id);

         $this->showSuccessNotification(trans('entities.pages_move_success', ['parentName' => $parent->name]));
         return redirect($page->getUrl());
     }
         $this->showSuccessNotification(trans('entities.pages_move_success', ['parentName' => $parent->name]));
         return redirect($page->getUrl());
     }


@@ -437,8 +429,6 @@ class PageController extends Controller
             return redirect()->back();
         }
 
             return redirect()->back();
         }
 

-        Activity::add($pageCopy, 'page_create', $pageCopy->book->id);
-

         $this->showSuccessNotification(trans('entities.pages_copy_success'));
         return redirect($pageCopy->getUrl());
     }
         $this->showSuccessNotification(trans('entities.pages_copy_success'));
         return redirect($pageCopy->getUrl());
     }


@@ -461,14 +451,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());