Code cleanup, bug squashing

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

diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index 630f888ed3e9dc0d16da96b622a03278b527cfb9..67d28a78a45ec388f15444de7621d3d3d29c2105 100644 (file)
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -1,10 +1,9 @@
 <?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\Exceptions\NotFoundException;
 use BookStack\Exceptions\NotifyException;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\NotifyException;


@@ -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());
     }


@@ -302,13 +300,11 @@ class PageController extends Controller
     {
         $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
         $this->checkOwnablePermission('page-delete', $page);
     {
         $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
         $this->checkOwnablePermission('page-delete', $page);

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

 
 

-        $book = $page->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($book->getUrl());
+        return redirect($parent->getUrl());

     }
 
     /**
     }
 
     /**


@@ -391,7 +387,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());
     }


@@ -436,8 +431,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());
     }