feat(PageContent): set unique ids on nested headers

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

diff --git a/app/Http/Controllers/ChapterController.php b/app/Http/Controllers/ChapterController.php
index 1355979107eb0181d272e3610511688d5772b7b7..9d2bd2489b6c883e961c16936640767a3f28578a 100644 (file)
--- a/app/Http/Controllers/ChapterController.php
+++ b/app/Http/Controllers/ChapterController.php
@@ -1,19 +1,21 @@
-<?php namespace BookStack\Http\Controllers;
+<?php

 
 

-use Activity;
-use BookStack\Entities\Book;
-use BookStack\Entities\Managers\BookContents;
+namespace BookStack\Http\Controllers;
+
+use BookStack\Actions\View;
+use BookStack\Entities\Models\Book;

 use BookStack\Entities\Repos\ChapterRepo;
 use BookStack\Entities\Repos\ChapterRepo;

+use BookStack\Entities\Tools\BookContents;
+use BookStack\Entities\Tools\NextPreviousContentLocator;
+use BookStack\Entities\Tools\PermissionsUpdater;

 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Exceptions\NotFoundException;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Throwable;
 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Exceptions\NotFoundException;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Throwable;

-use Views;

 
 class ChapterController extends Controller
 {
 
 class ChapterController extends Controller
 {

-

     protected $chapterRepo;
 
     /**
     protected $chapterRepo;
 
     /**


@@ -22,7 +24,6 @@ class ChapterController extends Controller
     public function __construct(ChapterRepo $chapterRepo)
     {
         $this->chapterRepo = $chapterRepo;
     public function __construct(ChapterRepo $chapterRepo)
     {
         $this->chapterRepo = $chapterRepo;

-        parent::__construct();

     }
 
     /**
     }
 
     /**


@@ -34,24 +35,25 @@ class ChapterController extends Controller
         $this->checkOwnablePermission('chapter-create', $book);
 
         $this->setPageTitle(trans('entities.chapters_create'));
         $this->checkOwnablePermission('chapter-create', $book);
 
         $this->setPageTitle(trans('entities.chapters_create'));

+

         return view('chapters.create', ['book' => $book, 'current' => $book]);
     }
 
     /**
      * Store a newly created chapter in storage.
         return view('chapters.create', ['book' => $book, 'current' => $book]);
     }
 
     /**
      * Store a newly created chapter in storage.

+     *

      * @throws ValidationException
      */
     public function store(Request $request, string $bookSlug)
     {
         $this->validate($request, [
      * @throws ValidationException
      */
     public function store(Request $request, string $bookSlug)
     {
         $this->validate($request, [

-            'name' => 'required|string|max:255'
+            'name' => ['required', 'string', 'max:255'],

         ]);
 
         $book = Book::visible()->where('slug', '=', $bookSlug)->firstOrFail();
         $this->checkOwnablePermission('chapter-create', $book);
 
         $chapter = $this->chapterRepo->create($request->all(), $book);
         ]);
 
         $book = Book::visible()->where('slug', '=', $bookSlug)->firstOrFail();
         $this->checkOwnablePermission('chapter-create', $book);
 
         $chapter = $this->chapterRepo->create($request->all(), $book);

-        Activity::add($chapter, 'chapter_create', $book->id);

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


@@ -66,15 +68,19 @@ class ChapterController extends Controller
 
         $sidebarTree = (new BookContents($chapter->book))->getTree();
         $pages = $chapter->getVisiblePages();
 
         $sidebarTree = (new BookContents($chapter->book))->getTree();
         $pages = $chapter->getVisiblePages();

-        Views::add($chapter);
+        $nextPreviousLocator = new NextPreviousContentLocator($chapter, $sidebarTree);
+        View::incrementFor($chapter);

 
         $this->setPageTitle($chapter->getShortName());
 
         $this->setPageTitle($chapter->getShortName());

+

         return view('chapters.show', [
         return view('chapters.show', [

-            'book' => $chapter->book,
-            'chapter' => $chapter,
-            'current' => $chapter,
+            'book'        => $chapter->book,
+            'chapter'     => $chapter,
+            'current'     => $chapter,

             'sidebarTree' => $sidebarTree,
             'sidebarTree' => $sidebarTree,

-            'pages' => $pages
+            'pages'       => $pages,
+            'next'        => $nextPreviousLocator->getNext(),
+            'previous'    => $nextPreviousLocator->getPrevious(),

         ]);
     }
 
         ]);
     }
 


@@ -87,11 +93,13 @@ class ChapterController extends Controller
         $this->checkOwnablePermission('chapter-update', $chapter);
 
         $this->setPageTitle(trans('entities.chapters_edit_named', ['chapterName' => $chapter->getShortName()]));
         $this->checkOwnablePermission('chapter-update', $chapter);
 
         $this->setPageTitle(trans('entities.chapters_edit_named', ['chapterName' => $chapter->getShortName()]));

+

         return view('chapters.edit', ['book' => $chapter->book, 'chapter' => $chapter, 'current' => $chapter]);
     }
 
     /**
      * Update the specified chapter in storage.
         return view('chapters.edit', ['book' => $chapter->book, 'chapter' => $chapter, 'current' => $chapter]);
     }
 
     /**
      * Update the specified chapter in storage.

+     *

      * @throws NotFoundException
      */
     public function update(Request $request, string $bookSlug, string $chapterSlug)
      * @throws NotFoundException
      */
     public function update(Request $request, string $bookSlug, string $chapterSlug)


@@ -100,13 +108,13 @@ class ChapterController extends Controller
         $this->checkOwnablePermission('chapter-update', $chapter);
 
         $this->chapterRepo->update($chapter, $request->all());
         $this->checkOwnablePermission('chapter-update', $chapter);
 
         $this->chapterRepo->update($chapter, $request->all());

-        Activity::add($chapter, 'chapter_update', $chapter->book->id);

 
         return redirect($chapter->getUrl());
     }
 
     /**
      * Shows the page to confirm deletion of this chapter.
 
         return redirect($chapter->getUrl());
     }
 
     /**
      * Shows the page to confirm deletion of this chapter.

+     *

      * @throws NotFoundException
      */
     public function showDelete(string $bookSlug, string $chapterSlug)
      * @throws NotFoundException
      */
     public function showDelete(string $bookSlug, string $chapterSlug)


@@ -115,11 +123,13 @@ class ChapterController extends Controller
         $this->checkOwnablePermission('chapter-delete', $chapter);
 
         $this->setPageTitle(trans('entities.chapters_delete_named', ['chapterName' => $chapter->getShortName()]));
         $this->checkOwnablePermission('chapter-delete', $chapter);
 
         $this->setPageTitle(trans('entities.chapters_delete_named', ['chapterName' => $chapter->getShortName()]));

+

         return view('chapters.delete', ['book' => $chapter->book, 'chapter' => $chapter, 'current' => $chapter]);
     }
 
     /**
      * Remove the specified chapter from storage.
         return view('chapters.delete', ['book' => $chapter->book, 'chapter' => $chapter, 'current' => $chapter]);
     }
 
     /**
      * Remove the specified chapter from storage.

+     *

      * @throws NotFoundException
      * @throws Throwable
      */
      * @throws NotFoundException
      * @throws Throwable
      */


@@ -128,7 +138,6 @@ class ChapterController extends Controller
         $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);
         $this->checkOwnablePermission('chapter-delete', $chapter);
 
         $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);
         $this->checkOwnablePermission('chapter-delete', $chapter);
 

-        Activity::addMessage('chapter_delete', $chapter->name, $chapter->book->id);

         $this->chapterRepo->destroy($chapter);
 
         return redirect($chapter->book->getUrl());
         $this->chapterRepo->destroy($chapter);
 
         return redirect($chapter->book->getUrl());


@@ -136,6 +145,7 @@ class ChapterController extends Controller
 
     /**
      * Show the page for moving a chapter.
 
     /**
      * Show the page for moving a chapter.

+     *

      * @throws NotFoundException
      */
     public function showMove(string $bookSlug, string $chapterSlug)
      * @throws NotFoundException
      */
     public function showMove(string $bookSlug, string $chapterSlug)


@@ -147,12 +157,13 @@ class ChapterController extends Controller
 
         return view('chapters.move', [
             'chapter' => $chapter,
 
         return view('chapters.move', [
             'chapter' => $chapter,

-            'book' => $chapter->book
+            'book'    => $chapter->book,

         ]);
     }
 
     /**
      * Perform the move action for a chapter.
         ]);
     }
 
     /**
      * Perform the move action for a chapter.

+     *

      * @throws NotFoundException
      */
     public function move(Request $request, string $bookSlug, string $chapterSlug)
      * @throws NotFoundException
      */
     public function move(Request $request, string $bookSlug, string $chapterSlug)


@@ -170,17 +181,18 @@ class ChapterController extends Controller
             $newBook = $this->chapterRepo->move($chapter, $entitySelection);
         } catch (MoveOperationException $exception) {
             $this->showErrorNotification(trans('errors.selected_book_not_found'));
             $newBook = $this->chapterRepo->move($chapter, $entitySelection);
         } catch (MoveOperationException $exception) {
             $this->showErrorNotification(trans('errors.selected_book_not_found'));

+

             return redirect()->back();
         }
 
             return redirect()->back();
         }
 

-        Activity::add($chapter, 'chapter_move', $newBook->id);
-

         $this->showSuccessNotification(trans('entities.chapter_move_success', ['bookName' => $newBook->name]));
         $this->showSuccessNotification(trans('entities.chapter_move_success', ['bookName' => $newBook->name]));

+

         return redirect($chapter->getUrl());
     }
 
     /**
      * Show the Restrictions view.
         return redirect($chapter->getUrl());
     }
 
     /**
      * Show the Restrictions view.

+     *

      * @throws NotFoundException
      */
     public function showPermissions(string $bookSlug, string $chapterSlug)
      * @throws NotFoundException
      */
     public function showPermissions(string $bookSlug, string $chapterSlug)


@@ -195,18 +207,18 @@ class ChapterController extends Controller
 
     /**
      * Set the restrictions for this chapter.
 
     /**
      * Set the restrictions for this chapter.

+     *

      * @throws NotFoundException
      */
      * @throws NotFoundException
      */

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

     {
         $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);
         $this->checkOwnablePermission('restrictions-manage', $chapter);
 
     {
         $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);
         $this->checkOwnablePermission('restrictions-manage', $chapter);
 

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

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

+

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