Improved empty lists. Fixes #10.

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

diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index c0ab01a090fa7cc0727cefd98d8566050f2bd598..b59dd2446419ce6788efa6538eae077b7c02061f 100644 (file)
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -2,11 +2,13 @@
 
 namespace Oxbow\Http\Controllers;
 
 
 namespace Oxbow\Http\Controllers;
 

+use Activity;

 use Illuminate\Http\Request;
 
 use Illuminate\Http\Request;
 

-use Illuminate\Support\Str;
+use Illuminate\Support\Facades\Auth;

 use Oxbow\Http\Requests;
 use Oxbow\Repos\BookRepo;
 use Oxbow\Http\Requests;
 use Oxbow\Repos\BookRepo;

+use Oxbow\Repos\ChapterRepo;

 use Oxbow\Repos\PageRepo;
 
 class PageController extends Controller
 use Oxbow\Repos\PageRepo;
 
 class PageController extends Controller


@@ -14,78 +16,75 @@ class PageController extends Controller
 
     protected $pageRepo;
     protected $bookRepo;
 
     protected $pageRepo;
     protected $bookRepo;

+    protected $chapterRepo;

 
     /**
      * PageController constructor.
 
     /**
      * PageController constructor.

-     * @param $pageRepo
-     * @param $bookRepo
+     * @param PageRepo    $pageRepo
+     * @param BookRepo    $bookRepo
+     * @param ChapterRepo $chapterRepo

      */
      */

-    public function __construct(PageRepo $pageRepo, BookRepo $bookRepo)
+    public function __construct(PageRepo $pageRepo, BookRepo $bookRepo, ChapterRepo $chapterRepo)

     {
         $this->pageRepo = $pageRepo;
         $this->bookRepo = $bookRepo;
     {
         $this->pageRepo = $pageRepo;
         $this->bookRepo = $bookRepo;

-    }
-
-
-    /**
-     * Display a listing of the resource.
-     *
-     * @return Response
-     */
-    public function index()
-    {
-        //
+        $this->chapterRepo = $chapterRepo;
+        parent::__construct();

     }
 
     /**
     }
 
     /**

-     * Show the form for creating a new resource.
+     * Show the form for creating a new page.

      *
      *

-     * @param $bookSlug
-     * @param bool $pageSlug
+     * @param      $bookSlug
+     * @param bool $chapterSlug

      * @return Response
      * @return Response

+     * @internal param bool $pageSlug

      */
      */

-    public function create($bookSlug, $pageSlug = false)
+    public function create($bookSlug, $chapterSlug = false)

     {
     {

+        $this->checkPermission('page-create');

         $book = $this->bookRepo->getBySlug($bookSlug);
         $book = $this->bookRepo->getBySlug($bookSlug);

-        $page = $pageSlug ? $this->pageRepo->getBySlug($pageSlug, $book->id) : false;
-        return view('pages/create', ['book' => $book, 'parentPage' => $page]);
+        $chapter = $chapterSlug ? $this->chapterRepo->getBySlug($chapterSlug, $book->id) : false;
+        return view('pages/create', ['book' => $book, 'chapter' => $chapter]);

     }
 
     /**
     }
 
     /**

-     * Store a newly created resource in storage.
+     * Store a newly created page in storage.

      *
      * @param  Request $request
      *
      * @param  Request $request

-     * @param $bookSlug
+     * @param          $bookSlug

      * @return Response
      */
     public function store(Request $request, $bookSlug)
     {
      * @return Response
      */
     public function store(Request $request, $bookSlug)
     {

+        $this->checkPermission('page-create');

         $this->validate($request, [
         $this->validate($request, [

-            'name' => 'required|string|max:255',
-            'html' => 'required|string',
-            'priority' => 'integer',
+            'name'   => 'required|string|max:255',
+            'html'   => 'required|string',

             'parent' => 'integer|exists:pages,id'
         ]);
         $book = $this->bookRepo->getBySlug($bookSlug);
         $page = $this->pageRepo->newFromInput($request->all());
             'parent' => 'integer|exists:pages,id'
         ]);
         $book = $this->bookRepo->getBySlug($bookSlug);
         $page = $this->pageRepo->newFromInput($request->all());

-        $slug = Str::slug($page->name);
-        while($this->pageRepo->countBySlug($slug, $book->id) > 0) {
-            $slug .= '1';
-        }
-        $page->slug =$slug;

 
 

-        if($request->has('parent')) {
-            $page->page_id = $request->get('parent');
+        $page->slug = $this->pageRepo->findSuitableSlug($page->name, $book->id);
+        $page->priority = $this->bookRepo->getNewPriority($book);
+
+        if ($request->has('chapter') && $this->chapterRepo->idExists($request->get('chapter'))) {
+            $page->chapter_id = $request->get('chapter');

         }
 
         $page->book_id = $book->id;
         $page->text = strip_tags($page->html);
         }
 
         $page->book_id = $book->id;
         $page->text = strip_tags($page->html);

+        $page->created_by = Auth::user()->id;
+        $page->updated_by = Auth::user()->id;

         $page->save();
         $page->save();

+        $this->pageRepo->saveRevision($page);
+        Activity::add($page, 'page_create', $book->id);

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

-     * Display the specified resource.
+     * Display the specified page.

      *
      * @param $bookSlug
      * @param $pageSlug
      *
      * @param $bookSlug
      * @param $pageSlug


@@ -95,14 +94,11 @@ class PageController extends Controller
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $page = $this->pageRepo->getBySlug($pageSlug, $book->id);

-        $breadCrumbs = $this->pageRepo->getBreadCrumbs($page);
-        $sidebarBookTree = $this->bookRepo->getTree($book, $page->id);
-        //dd($sidebarBookTree);
-        return view('pages/show', ['page' => $page, 'breadCrumbs' => $breadCrumbs, 'book' => $book, 'sidebarBookTree' => $sidebarBookTree]);
+        return view('pages/show', ['page' => $page, 'book' => $book, 'current' => $page]);

     }
 
     /**
     }
 
     /**

-     * Show the form for editing the specified resource.
+     * Show the form for editing the specified page.

      *
      * @param $bookSlug
      * @param $pageSlug
      *
      * @param $bookSlug
      * @param $pageSlug


@@ -110,30 +106,27 @@ class PageController extends Controller
      */
     public function edit($bookSlug, $pageSlug)
     {
      */
     public function edit($bookSlug, $pageSlug)
     {

+        $this->checkPermission('page-update');

         $book = $this->bookRepo->getBySlug($bookSlug);
         $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
         $book = $this->bookRepo->getBySlug($bookSlug);
         $page = $this->pageRepo->getBySlug($pageSlug, $book->id);

-        return view('pages/edit', ['page' => $page]);
+        return view('pages/edit', ['page' => $page, 'book' => $book, 'current' => $page]);

     }
 
     /**
     }
 
     /**

-     * Update the specified resource in storage.
+     * Update the specified page in storage.

      *
      * @param  Request $request
      *
      * @param  Request $request

-     * @param $bookSlug
-     * @param $pageSlug
+     * @param          $bookSlug
+     * @param          $pageSlug

      * @return Response
      */
     public function update(Request $request, $bookSlug, $pageSlug)
     {
      * @return Response
      */
     public function update(Request $request, $bookSlug, $pageSlug)
     {

+        $this->checkPermission('page-update');

         $book = $this->bookRepo->getBySlug($bookSlug);
         $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
         $book = $this->bookRepo->getBySlug($bookSlug);
         $page = $this->pageRepo->getBySlug($pageSlug, $book->id);

-        $page->fill($request->all());
-        $slug = Str::slug($page->name);
-        while($this->pageRepo->countBySlug($slug, $book->id) > 0 && $slug != $pageSlug) {
-            $slug .= '1';
-        }
-        $page->text = strip_tags($page->html);
-        $page->save();
+        $this->pageRepo->updatePage($page, $book->id, $request->all());
+        Activity::add($page, 'page_update', $book->id);

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


@@ -157,7 +150,7 @@ class PageController extends Controller
     public function searchAll(Request $request)
     {
         $searchTerm = $request->get('term');
     public function searchAll(Request $request)
     {
         $searchTerm = $request->get('term');

-        if(empty($searchTerm)) return redirect()->back();
+        if (empty($searchTerm)) return redirect()->back();

 
         $pages = $this->pageRepo->getBySearch($searchTerm);
         return view('pages/search-results', ['pages' => $pages, 'searchTerm' => $searchTerm]);
 
         $pages = $this->pageRepo->getBySearch($searchTerm);
         return view('pages/search-results', ['pages' => $pages, 'searchTerm' => $searchTerm]);


@@ -170,31 +163,113 @@ class PageController extends Controller
      */
     public function sortPages($bookSlug)
     {
      */
     public function sortPages($bookSlug)
     {

+        $this->checkPermission('book-update');

         $book = $this->bookRepo->getBySlug($bookSlug);
         $book = $this->bookRepo->getBySlug($bookSlug);

-        $tree = $this->bookRepo->getTree($book);
-        return view('pages/sort', ['book' => $book, 'tree' => $tree]);
+        return view('pages/sort', ['book' => $book, 'current' => $book]);

     }
 
     }
 

+    /**
+     * Saves an array of sort mapping to pages and chapters.
+     *
+     * @param         $bookSlug
+     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */

     public function savePageSort($bookSlug, Request $request)
     {
     public function savePageSort($bookSlug, Request $request)
     {

+        $this->checkPermission('book-update');

         $book = $this->bookRepo->getBySlug($bookSlug);
         $book = $this->bookRepo->getBySlug($bookSlug);

-        if(!$request->has('sort-tree')) {
+        // Return if no map sent
+        if (!$request->has('sort-tree')) {

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

+        // Sort pages and chapters

         $sortMap = json_decode($request->get('sort-tree'));
         $sortMap = json_decode($request->get('sort-tree'));

-        $this->pageRepo->applySortMap($sortMap, $book->id);
+        foreach ($sortMap as $index => $bookChild) {
+            $id = $bookChild->id;
+            $isPage = $bookChild->type == 'page';
+            $model = $isPage ? $this->pageRepo->getById($id) : $this->chapterRepo->getById($id);
+            $model->priority = $index;
+            if ($isPage) {
+                $model->chapter_id = ($bookChild->parentChapter === false) ? 0 : $bookChild->parentChapter;
+            }
+            $model->save();
+        }
+        Activity::add($book, 'book_sort', $book->id);

         return redirect($book->getUrl());
     }
 
     /**
         return redirect($book->getUrl());
     }
 
     /**

-     * Remove the specified resource from storage.
+     * Show the deletion page for the specified page.
+     * @param $bookSlug
+     * @param $pageSlug
+     * @return \Illuminate\View\View
+     */
+    public function showDelete($bookSlug, $pageSlug)
+    {
+        $this->checkPermission('page-delete');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        return view('pages/delete', ['book' => $book, 'page' => $page, 'current' => $page]);
+    }
+
+    /**
+     * Remove the specified page from storage.

      *
      *

-     * @param  int  $id
+     * @param $bookSlug
+     * @param $pageSlug

      * @return Response
      * @return Response

+     * @internal param int $id
+     */
+    public function destroy($bookSlug, $pageSlug)
+    {
+        $this->checkPermission('page-delete');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        Activity::addMessage('page_delete', $book->id, $page->name);
+        Activity::removeEntity($page);
+        $page->delete();
+        return redirect($book->getUrl());
+    }
+
+    /**
+     * Shows the last revisions for this page.
+     * @param $bookSlug
+     * @param $pageSlug
+     * @return \Illuminate\View\View
+     */
+    public function showRevisions($bookSlug, $pageSlug)
+    {
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        return view('pages/revisions', ['page' => $page, 'book' => $book, 'current' => $page]);
+    }
+
+    /**
+     * Shows a preview of a single revision
+     * @param $bookSlug
+     * @param $pageSlug
+     * @param $revisionId
+     * @return \Illuminate\View\View

      */
      */

-    public function destroy($id)
+    public function showRevision($bookSlug, $pageSlug, $revisionId)

     {
     {

-        //
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $revision = $this->pageRepo->getRevisionById($revisionId);
+        $page->fill($revision->toArray());
+        return view('pages/revision', ['page' => $page, 'book' => $book]);
+    }
+
+    public function restoreRevision($bookSlug, $pageSlug, $revisionId)
+    {
+        $this->checkPermission('page-update');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $revision = $this->pageRepo->getRevisionById($revisionId);
+        $page = $this->pageRepo->updatePage($page, $book->id, $revision->toArray());
+        Activity::add($page, 'page_restore', $book->id);
+        return redirect($page->getUrl());

     }
 }
     }
 }