Merge branch 'master' into translations

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

diff --git a/app/Http/Controllers/ChapterController.php b/app/Http/Controllers/ChapterController.php
index 3c9050bf6b4b705aeb371a09b8273ed9ea581245..84983518514d8342f9fbba4aeb63a7a34bd82887 100644 (file)
--- a/app/Http/Controllers/ChapterController.php
+++ b/app/Http/Controllers/ChapterController.php
@@ -3,9 +3,9 @@
 use Activity;
 use BookStack\Repos\UserRepo;
 use Illuminate\Http\Request;
 use Activity;
 use BookStack\Repos\UserRepo;
 use Illuminate\Http\Request;

-use BookStack\Http\Requests;

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

+use Illuminate\Http\Response;

 use Views;
 
 class ChapterController extends Controller
 use Views;
 
 class ChapterController extends Controller


@@ -38,7 +38,7 @@ class ChapterController extends Controller
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('chapter-create', $book);
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('chapter-create', $book);

-        $this->setPageTitle('Create New Chapter');
+        $this->setPageTitle(trans('entities.chapters_create'));

         return view('chapters/create', ['book' => $book, 'current' => $book]);
     }
 
         return view('chapters/create', ['book' => $book, 'current' => $book]);
     }
 


@@ -99,7 +99,7 @@ class ChapterController extends Controller
         $book = $this->bookRepo->getBySlug($bookSlug);
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
         $this->checkOwnablePermission('chapter-update', $chapter);
         $book = $this->bookRepo->getBySlug($bookSlug);
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
         $this->checkOwnablePermission('chapter-update', $chapter);

-        $this->setPageTitle('Edit Chapter' . $chapter->getShortName());
+        $this->setPageTitle(trans('entities.chapters_edit_named', ['chapterName' => $chapter->getShortName()]));

         return view('chapters/edit', ['book' => $book, 'chapter' => $chapter, 'current' => $chapter]);
     }
 
         return view('chapters/edit', ['book' => $book, 'chapter' => $chapter, 'current' => $chapter]);
     }
 


@@ -115,9 +115,11 @@ class ChapterController extends Controller
         $book = $this->bookRepo->getBySlug($bookSlug);
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
         $this->checkOwnablePermission('chapter-update', $chapter);
         $book = $this->bookRepo->getBySlug($bookSlug);
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
         $this->checkOwnablePermission('chapter-update', $chapter);

+        if ($chapter->name !== $request->get('name')) {
+            $chapter->slug = $this->chapterRepo->findSuitableSlug($request->get('name'), $book->id, $chapter->id);
+        }

         $chapter->fill($request->all());
         $chapter->fill($request->all());

-        $chapter->slug = $this->chapterRepo->findSuitableSlug($chapter->name, $book->id, $chapter->id);
-        $chapter->updated_by = auth()->user()->id;
+        $chapter->updated_by = user()->id;

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


@@ -134,7 +136,7 @@ class ChapterController extends Controller
         $book = $this->bookRepo->getBySlug($bookSlug);
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
         $this->checkOwnablePermission('chapter-delete', $chapter);
         $book = $this->bookRepo->getBySlug($bookSlug);
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
         $this->checkOwnablePermission('chapter-delete', $chapter);

-        $this->setPageTitle('Delete Chapter' . $chapter->getShortName());
+        $this->setPageTitle(trans('entities.chapters_delete_named', ['chapterName' => $chapter->getShortName()]));

         return view('chapters/delete', ['book' => $book, 'chapter' => $chapter, 'current' => $chapter]);
     }
 
         return view('chapters/delete', ['book' => $book, 'chapter' => $chapter, 'current' => $chapter]);
     }
 


@@ -164,6 +166,7 @@ class ChapterController extends Controller
     public function showMove($bookSlug, $chapterSlug) {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
     public function showMove($bookSlug, $chapterSlug) {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);

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

         $this->checkOwnablePermission('chapter-update', $chapter);
         return view('chapters/move', [
             'chapter' => $chapter,
         $this->checkOwnablePermission('chapter-update', $chapter);
         return view('chapters/move', [
             'chapter' => $chapter,


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

-            session()->flash('The selected Book was not found');
+            session()->flash('error', trans('errors.selected_book_not_found'));

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

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

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

-        session()->flash('success', sprintf('Chapter moved to "%s"', $parent->name));
+        session()->flash('success', trans('entities.chapter_move_success', ['bookName' => $parent->name]));

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


@@ -242,7 +245,7 @@ class ChapterController extends Controller
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
         $this->checkOwnablePermission('restrictions-manage', $chapter);
         $this->chapterRepo->updateEntityPermissionsFromRequest($request, $chapter);
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
         $this->checkOwnablePermission('restrictions-manage', $chapter);
         $this->chapterRepo->updateEntityPermissionsFromRequest($request, $chapter);

-        session()->flash('success', 'Chapter Restrictions Updated');
+        session()->flash('success', trans('entities.chapters_permissions_success'));

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