Closes #69. Implemented and tested memcached.

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

diff --git a/app/Http/Controllers/ChapterController.php b/app/Http/Controllers/ChapterController.php
index 42ae113559260b8fdc29325afb2e016b9cee4077..fc13e8b58b777a24584cd59f01a6020fa74eee95 100644 (file)
--- a/app/Http/Controllers/ChapterController.php
+++ b/app/Http/Controllers/ChapterController.php
@@ -33,7 +33,6 @@ class ChapterController extends Controller
 
     /**
      * Show the form for creating a new chapter.
 
     /**
      * Show the form for creating a new chapter.

-     *

      * @param $bookSlug
      * @return Response
      */
      * @param $bookSlug
      * @return Response
      */


@@ -41,12 +40,12 @@ class ChapterController extends Controller
     {
         $this->checkPermission('chapter-create');
         $book = $this->bookRepo->getBySlug($bookSlug);
     {
         $this->checkPermission('chapter-create');
         $book = $this->bookRepo->getBySlug($bookSlug);

+        $this->setPageTitle('Create New Chapter');

         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.

-     *

      * @param          $bookSlug
      * @param  Request $request
      * @return Response
      * @param          $bookSlug
      * @param  Request $request
      * @return Response


@@ -62,8 +61,8 @@ class ChapterController extends Controller
         $chapter = $this->chapterRepo->newFromInput($request->all());
         $chapter->slug = $this->chapterRepo->findSuitableSlug($chapter->name, $book->id);
         $chapter->priority = $this->bookRepo->getNewPriority($book);
         $chapter = $this->chapterRepo->newFromInput($request->all());
         $chapter->slug = $this->chapterRepo->findSuitableSlug($chapter->name, $book->id);
         $chapter->priority = $this->bookRepo->getNewPriority($book);

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

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


@@ -71,7 +70,6 @@ class ChapterController extends Controller
 
     /**
      * Display the specified chapter.
 
     /**
      * Display the specified chapter.

-     *

      * @param $bookSlug
      * @param $chapterSlug
      * @return Response
      * @param $bookSlug
      * @param $chapterSlug
      * @return Response


@@ -82,12 +80,12 @@ class ChapterController extends Controller
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
         $sidebarTree = $this->bookRepo->getChildren($book);
         Views::add($chapter);
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
         $sidebarTree = $this->bookRepo->getChildren($book);
         Views::add($chapter);

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

         return view('chapters/show', ['book' => $book, 'chapter' => $chapter, 'current' => $chapter, 'sidebarTree' => $sidebarTree]);
     }
 
     /**
      * Show the form for editing the specified chapter.
         return view('chapters/show', ['book' => $book, 'chapter' => $chapter, 'current' => $chapter, 'sidebarTree' => $sidebarTree]);
     }
 
     /**
      * Show the form for editing the specified chapter.

-     *

      * @param $bookSlug
      * @param $chapterSlug
      * @return Response
      * @param $bookSlug
      * @param $chapterSlug
      * @return Response


@@ -97,12 +95,12 @@ class ChapterController extends Controller
         $this->checkPermission('chapter-update');
         $book = $this->bookRepo->getBySlug($bookSlug);
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
         $this->checkPermission('chapter-update');
         $book = $this->bookRepo->getBySlug($bookSlug);
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);

+        $this->setPageTitle('Edit Chapter' . $chapter->getShortName());

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

-     *

      * @param  Request $request
      * @param          $bookSlug
      * @param          $chapterSlug
      * @param  Request $request
      * @param          $bookSlug
      * @param          $chapterSlug


@@ -115,7 +113,7 @@ class ChapterController extends Controller
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
         $chapter->fill($request->all());
         $chapter->slug = $this->chapterRepo->findSuitableSlug($chapter->name, $book->id, $chapter->id);
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
         $chapter->fill($request->all());
         $chapter->slug = $this->chapterRepo->findSuitableSlug($chapter->name, $book->id, $chapter->id);

-        $chapter->updated_by = Auth::user()->id;
+        $chapter->updated_by = auth()->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());


@@ -132,12 +130,12 @@ class ChapterController extends Controller
         $this->checkPermission('chapter-delete');
         $book = $this->bookRepo->getBySlug($bookSlug);
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
         $this->checkPermission('chapter-delete');
         $book = $this->bookRepo->getBySlug($bookSlug);
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);

+        $this->setPageTitle('Delete Chapter' . $chapter->getShortName());

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

-     *

      * @param $bookSlug
      * @param $chapterSlug
      * @return Response
      * @param $bookSlug
      * @param $chapterSlug
      * @return Response