French translation update

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

diff --git a/app/Http/Controllers/ChapterController.php b/app/Http/Controllers/ChapterController.php
index b90a6dcb2a972f25c56a4c316a84fb10d5f53f4b..f728d13137e4505acd1e70b97a5fd73f23011932 100644 (file)
--- a/app/Http/Controllers/ChapterController.php
+++ b/app/Http/Controllers/ChapterController.php
@@ -3,7 +3,6 @@
 use Activity;
 use BookStack\Auth\UserRepo;
 use BookStack\Entities\Repos\EntityRepo;
 use Activity;
 use BookStack\Auth\UserRepo;
 use BookStack\Entities\Repos\EntityRepo;

-use BookStack\Entities\ExportService;

 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Views;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Views;


@@ -33,7 +32,7 @@ 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'));
         return view('chapters.create', ['book' => $book, 'current' => $book]);
         $this->checkOwnablePermission('chapter-create', $book);
         $this->setPageTitle(trans('entities.chapters_create'));
         return view('chapters.create', ['book' => $book, 'current' => $book]);


@@ -53,7 +52,7 @@ class ChapterController extends Controller
             'name' => 'required|string|max:255'
         ]);
 
             '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();


@@ -71,7 +70,7 @@ 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);
         $sidebarTree = $this->entityRepo->getBookChildren($chapter->book);
         Views::add($chapter);
         $this->checkOwnablePermission('chapter-view', $chapter);
         $sidebarTree = $this->entityRepo->getBookChildren($chapter->book);
         Views::add($chapter);


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


@@ -110,10 +109,10 @@ class ChapterController extends Controller
      */
     public function update(Request $request, string $bookSlug, string $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);
 

-        $this->entityRepo->updateFromInput('chapter', $chapter, $request->all());
+        $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());
     }


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


@@ -140,10 +139,10 @@ 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);
+        Activity::addMessage('chapter_delete', $chapter->name, $book->id);

         $this->entityRepo->destroyChapter($chapter);
         return redirect($book->getUrl());
     }
         $this->entityRepo->destroyChapter($chapter);
         return redirect($book->getUrl());
     }


@@ -157,7 +156,7 @@ class ChapterController extends Controller
      */
     public function showMove($bookSlug, $chapterSlug)
     {
      */
     public function showMove($bookSlug, $chapterSlug)
     {

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

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


@@ -177,7 +176,7 @@ class ChapterController extends Controller
      */
     public function move(Request $request, string $bookSlug, string $chapterSlug)
     {
      */
     public function move(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-delete', $chapter);
 
         $this->checkOwnablePermission('chapter-update', $chapter);
         $this->checkOwnablePermission('chapter-delete', $chapter);
 


@@ -197,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->entityRepo->changeBook('chapter', $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());
     }


@@ -217,7 +218,7 @@ class ChapterController extends Controller
      */
     public function showPermissions($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();
         return view('chapters.permissions', [
         $this->checkOwnablePermission('restrictions-manage', $chapter);
         $roles = $this->userRepo->getRestrictableRoles();
         return view('chapters.permissions', [


@@ -237,10 +238,10 @@ class ChapterController extends Controller
      */
     public function permissions(Request $request, string $bookSlug, string $chapterSlug)
     {
      */
     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->entityRepo->updateEntityPermissionsFromRequest($request, $chapter);
         $this->checkOwnablePermission('restrictions-manage', $chapter);
         $this->entityRepo->updateEntityPermissionsFromRequest($request, $chapter);

-        session()->flash('success', trans('entities.chapters_permissions_success'));
+        $this->showSuccessNotification( trans('entities.chapters_permissions_success'));

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