French translation update

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

diff --git a/app/Http/Controllers/ChapterController.php b/app/Http/Controllers/ChapterController.php
index e71ed4d98661064adb75a2f3a9a56986d71d3f14..f728d13137e4505acd1e70b97a5fd73f23011932 100644 (file)
--- a/app/Http/Controllers/ChapterController.php
+++ b/app/Http/Controllers/ChapterController.php
@@ -1,35 +1,26 @@
 <?php namespace BookStack\Http\Controllers;
 
 use Activity;
 <?php namespace BookStack\Http\Controllers;
 
 use Activity;

-use BookStack\Repos\EntityRepo;
-use BookStack\Repos\UserRepo;
+use BookStack\Auth\UserRepo;
+use BookStack\Entities\Repos\EntityRepo;

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

-use BookStack\Repos\BookRepo;
-use BookStack\Repos\ChapterRepo;

 use Illuminate\Http\Response;
 use Views;
 
 class ChapterController extends Controller
 {
 
 use Illuminate\Http\Response;
 use Views;
 
 class ChapterController extends Controller
 {
 

-    protected $bookRepo;
-    protected $chapterRepo;

     protected $userRepo;
     protected $entityRepo;
 
     /**
      * ChapterController constructor.
      * @param EntityRepo $entityRepo
     protected $userRepo;
     protected $entityRepo;
 
     /**
      * ChapterController constructor.
      * @param EntityRepo $entityRepo

-     * @param BookRepo $bookRepo
-     * @param ChapterRepo $chapterRepo

      * @param UserRepo $userRepo
      */
      * @param UserRepo $userRepo
      */

-    public function __construct(EntityRepo $entityRepo, BookRepo $bookRepo, ChapterRepo $chapterRepo, UserRepo $userRepo)
+    public function __construct(EntityRepo $entityRepo, UserRepo $userRepo)

     {
         $this->entityRepo = $entityRepo;
     {
         $this->entityRepo = $entityRepo;

-        // TODO - Remove below
-        $this->bookRepo = $bookRepo;
-        $this->chapterRepo = $chapterRepo;

         $this->userRepo = $userRepo;
         parent::__construct();
     }
         $this->userRepo = $userRepo;
         parent::__construct();
     }


@@ -41,30 +32,32 @@ class ChapterController extends Controller
      */
     public function create($bookSlug)
     {
      */
     public function create($bookSlug)
     {

-        $book = $this->entityRepo->getBySlug('book', $bookSlug);
+        $book = $this->entityRepo->getEntityBySlug('book', $bookSlug);

         $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]);
+        return view('chapters.create', ['book' => $book, 'current' => $book]);

     }
 
     /**
      * Store a newly created chapter in storage.
     }
 
     /**
      * Store a newly created chapter in storage.

-     * @param          $bookSlug
-     * @param  Request $request
+     * @param Request $request
+     * @param string $bookSlug

      * @return Response
      * @return Response

+     * @throws \BookStack\Exceptions\NotFoundException
+     * @throws \Illuminate\Validation\ValidationException

      */
      */

-    public function store($bookSlug, Request $request)
+    public function store(Request $request, string $bookSlug)

     {
         $this->validate($request, [
             'name' => 'required|string|max:255'
         ]);
 
     {
         $this->validate($request, [
             'name' => 'required|string|max:255'
         ]);
 

-        $book = $this->entityRepo->getBySlug('book', $bookSlug);
+        $book = $this->entityRepo->getEntityBySlug('book', $bookSlug);

         $this->checkOwnablePermission('chapter-create', $book);
 
         $input = $request->all();
         $this->checkOwnablePermission('chapter-create', $book);
 
         $input = $request->all();

-        $input['priority'] = $this->bookRepo->getNewPriority($book);
-        $chapter = $this->chapterRepo->createFromInput($input, $book);
+        $input['priority'] = $this->entityRepo->getNewBookPriority($book);
+        $chapter = $this->entityRepo->createFromInput('chapter', $input, $book);

         Activity::add($chapter, 'chapter_create', $book->id);
         return redirect($chapter->getUrl());
     }
         Activity::add($chapter, 'chapter_create', $book->id);
         return redirect($chapter->getUrl());
     }


@@ -77,13 +70,13 @@ class ChapterController extends Controller
      */
     public function show($bookSlug, $chapterSlug)
     {
      */
     public function show($bookSlug, $chapterSlug)
     {

-        $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
+        $chapter = $this->entityRepo->getEntityBySlug('chapter', $chapterSlug, $bookSlug);

         $this->checkOwnablePermission('chapter-view', $chapter);
         $this->checkOwnablePermission('chapter-view', $chapter);

-        $sidebarTree = $this->bookRepo->getChildren($chapter->book);
+        $sidebarTree = $this->entityRepo->getBookChildren($chapter->book);

         Views::add($chapter);
         $this->setPageTitle($chapter->getShortName());
         Views::add($chapter);
         $this->setPageTitle($chapter->getShortName());

-        $pages = $this->chapterRepo->getChildren($chapter);
-        return view('chapters/show', [
+        $pages = $this->entityRepo->getChapterChildren($chapter);
+        return view('chapters.show', [

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


@@ -100,29 +93,26 @@ class ChapterController extends Controller
      */
     public function edit($bookSlug, $chapterSlug)
     {
      */
     public function edit($bookSlug, $chapterSlug)
     {

-        $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
+        $chapter = $this->entityRepo->getEntityBySlug('chapter', $chapterSlug, $bookSlug);

         $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]);
+        return view('chapters.edit', ['book' => $chapter->book, 'chapter' => $chapter, 'current' => $chapter]);

     }
 
     /**
      * Update the specified chapter in storage.
     }
 
     /**
      * Update the specified chapter in storage.

-     * @param  Request $request
-     * @param          $bookSlug
-     * @param          $chapterSlug
+     * @param Request $request
+     * @param string $bookSlug
+     * @param string $chapterSlug

      * @return Response
      * @return Response

+     * @throws \BookStack\Exceptions\NotFoundException

      */
      */

-    public function update(Request $request, $bookSlug, $chapterSlug)
+    public function update(Request $request, string $bookSlug, string $chapterSlug)

     {
     {

-        $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
+        $chapter = $this->entityRepo->getEntityBySlug('chapter', $chapterSlug, $bookSlug);

         $this->checkOwnablePermission('chapter-update', $chapter);
         $this->checkOwnablePermission('chapter-update', $chapter);

-        if ($chapter->name !== $request->get('name')) {
-            $chapter->slug = $this->chapterRepo->findSuitableSlug($request->get('name'), $chapter->book->id, $chapter->id);
-        }
-        $chapter->fill($request->all());
-        $chapter->updated_by = user()->id;
-        $chapter->save();
+
+        $this->entityRepo->updateFromInput($chapter, $request->all());

         Activity::add($chapter, 'chapter_update', $chapter->book->id);
         return redirect($chapter->getUrl());
     }
         Activity::add($chapter, 'chapter_update', $chapter->book->id);
         return redirect($chapter->getUrl());
     }


@@ -135,10 +125,10 @@ class ChapterController extends Controller
      */
     public function showDelete($bookSlug, $chapterSlug)
     {
      */
     public function showDelete($bookSlug, $chapterSlug)
     {

-        $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
+        $chapter = $this->entityRepo->getEntityBySlug('chapter', $chapterSlug, $bookSlug);

         $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]);
+        return view('chapters.delete', ['book' => $chapter->book, 'chapter' => $chapter, 'current' => $chapter]);

     }
 
     /**
     }
 
     /**


@@ -149,11 +139,11 @@ class ChapterController extends Controller
      */
     public function destroy($bookSlug, $chapterSlug)
     {
      */
     public function destroy($bookSlug, $chapterSlug)
     {

-        $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
+        $chapter = $this->entityRepo->getEntityBySlug('chapter', $chapterSlug, $bookSlug);

         $book = $chapter->book;
         $this->checkOwnablePermission('chapter-delete', $chapter);
         $book = $chapter->book;
         $this->checkOwnablePermission('chapter-delete', $chapter);

-        Activity::addMessage('chapter_delete', $book->id, $chapter->name);
-        $this->chapterRepo->destroy($chapter);
+        Activity::addMessage('chapter_delete', $chapter->name, $book->id);
+        $this->entityRepo->destroyChapter($chapter);

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


@@ -164,11 +154,13 @@ class ChapterController extends Controller
      * @return mixed
      * @throws \BookStack\Exceptions\NotFoundException
      */
      * @return mixed
      * @throws \BookStack\Exceptions\NotFoundException
      */

-    public function showMove($bookSlug, $chapterSlug) {
-        $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
+    public function showMove($bookSlug, $chapterSlug)
+    {
+        $chapter = $this->entityRepo->getEntityBySlug('chapter', $chapterSlug, $bookSlug);

         $this->setPageTitle(trans('entities.chapters_move_named', ['chapterName' => $chapter->getShortName()]));
         $this->checkOwnablePermission('chapter-update', $chapter);
         $this->setPageTitle(trans('entities.chapters_move_named', ['chapterName' => $chapter->getShortName()]));
         $this->checkOwnablePermission('chapter-update', $chapter);

-        return view('chapters/move', [
+        $this->checkOwnablePermission('chapter-delete', $chapter);
+        return view('chapters.move', [

             'chapter' => $chapter,
             'book' => $chapter->book
         ]);
             'chapter' => $chapter,
             'book' => $chapter->book
         ]);


@@ -176,15 +168,17 @@ class ChapterController extends Controller
 
     /**
      * Perform the move action for a chapter.
 
     /**
      * Perform the move action for a chapter.

-     * @param $bookSlug
-     * @param $chapterSlug

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

+     * @param string $bookSlug
+     * @param string $chapterSlug

      * @return mixed
      * @throws \BookStack\Exceptions\NotFoundException
      */
      * @return mixed
      * @throws \BookStack\Exceptions\NotFoundException
      */

-    public function move($bookSlug, $chapterSlug, Request $request) {
-        $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
+    public function move(Request $request, string $bookSlug, string $chapterSlug)
+    {
+        $chapter = $this->entityRepo->getEntityBySlug('chapter', $chapterSlug, $bookSlug);

         $this->checkOwnablePermission('chapter-update', $chapter);
         $this->checkOwnablePermission('chapter-update', $chapter);

+        $this->checkOwnablePermission('chapter-delete', $chapter);

 
         $entitySelection = $request->get('entity_selection', null);
         if ($entitySelection === null || $entitySelection === '') {
 
         $entitySelection = $request->get('entity_selection', null);
         if ($entitySelection === null || $entitySelection === '') {


@@ -202,13 +196,15 @@ class ChapterController extends Controller
         }
 
         if ($parent === false || $parent === null) {
         }
 
         if ($parent === false || $parent === null) {

-            session()->flash('error', trans('errors.selected_book_not_found'));
+            $this->showErrorNotification( trans('errors.selected_book_not_found'));

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

-        $this->chapterRepo->changeBook($parent->id, $chapter, true);
+        $this->entityRepo->changeBook($chapter, $parent->id);
+        $chapter->rebuildPermissions();
+

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

-        session()->flash('success', trans('entities.chapter_move_success', ['bookName' => $parent->name]));
+        $this->showSuccessNotification( trans('entities.chapter_move_success', ['bookName' => $parent->name]));

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


@@ -218,13 +214,14 @@ class ChapterController extends Controller
      * @param $bookSlug
      * @param $chapterSlug
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      * @param $bookSlug
      * @param $chapterSlug
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View

+     * @throws \BookStack\Exceptions\NotFoundException

      */
      */

-    public function showRestrict($bookSlug, $chapterSlug)
+    public function showPermissions($bookSlug, $chapterSlug)

     {
     {

-        $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
+        $chapter = $this->entityRepo->getEntityBySlug('chapter', $chapterSlug, $bookSlug);

         $this->checkOwnablePermission('restrictions-manage', $chapter);
         $roles = $this->userRepo->getRestrictableRoles();
         $this->checkOwnablePermission('restrictions-manage', $chapter);
         $roles = $this->userRepo->getRestrictableRoles();

-        return view('chapters/restrictions', [
+        return view('chapters.permissions', [

             'chapter' => $chapter,
             'roles' => $roles
         ]);
             'chapter' => $chapter,
             'roles' => $roles
         ]);


@@ -232,17 +229,19 @@ class ChapterController extends Controller
 
     /**
      * Set the restrictions for this chapter.
 
     /**
      * Set the restrictions for this chapter.

-     * @param $bookSlug
-     * @param $chapterSlug

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

+     * @param string $bookSlug
+     * @param string $chapterSlug

      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector

+     * @throws \BookStack\Exceptions\NotFoundException
+     * @throws \Throwable

      */
      */

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

     {
     {

-        $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
+        $chapter = $this->entityRepo->getEntityBySlug('chapter', $chapterSlug, $bookSlug);

         $this->checkOwnablePermission('restrictions-manage', $chapter);
         $this->checkOwnablePermission('restrictions-manage', $chapter);

-        $this->chapterRepo->updateEntityPermissionsFromRequest($request, $chapter);
-        session()->flash('success', trans('entities.chapters_permissions_success'));
+        $this->entityRepo->updateEntityPermissionsFromRequest($request, $chapter);
+        $this->showSuccessNotification( trans('entities.chapters_permissions_success'));

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