Improved empty lists. Fixes #10.

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

diff --git a/app/Http/Controllers/ChapterController.php b/app/Http/Controllers/ChapterController.php
index e7d1f17993fde863f8a149dca1c9f96de370245b..98e7a66781ba978e2b092346ba01fb93c6c59143 100644 (file)
--- a/app/Http/Controllers/ChapterController.php
+++ b/app/Http/Controllers/ChapterController.php
@@ -2,8 +2,10 @@
 
 namespace Oxbow\Http\Controllers;
 
 
 namespace Oxbow\Http\Controllers;
 

+use Activity;

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

+use Illuminate\Support\Facades\Auth;

 use Oxbow\Http\Requests;
 use Oxbow\Http\Controllers\Controller;
 use Oxbow\Repos\BookRepo;
 use Oxbow\Http\Requests;
 use Oxbow\Http\Controllers\Controller;
 use Oxbow\Repos\BookRepo;


@@ -20,44 +22,37 @@ class ChapterController extends Controller
      * @param $bookRepo
      * @param $chapterRepo
      */
      * @param $bookRepo
      * @param $chapterRepo
      */

-    public function __construct(BookRepo $bookRepo,ChapterRepo $chapterRepo)
+    public function __construct(BookRepo $bookRepo, ChapterRepo $chapterRepo)

     {
         $this->bookRepo = $bookRepo;
         $this->chapterRepo = $chapterRepo;
     {
         $this->bookRepo = $bookRepo;
         $this->chapterRepo = $chapterRepo;

+        parent::__construct();

     }
 
 
     /**
     }
 
 
     /**

-     * Display a listing of the resource.
-     *
-     * @return Response
-     */
-    public function index()
-    {
-        //
-    }
-
-    /**
-     * Show the form for creating a new resource.
+     * Show the form for creating a new chapter.

      *
      * @param $bookSlug
      * @return Response
      */
     public function create($bookSlug)
     {
      *
      * @param $bookSlug
      * @return Response
      */
     public function create($bookSlug)
     {

+        $this->checkPermission('chapter-create');

         $book = $this->bookRepo->getBySlug($bookSlug);
         $book = $this->bookRepo->getBySlug($bookSlug);

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

     }
 
     /**
     }
 
     /**

-     * Store a newly created resource in storage.
+     * Store a newly created chapter in storage.

      *
      *

-     * @param $bookSlug
+     * @param          $bookSlug

      * @param  Request $request
      * @return Response
      */
     public function store($bookSlug, Request $request)
     {
      * @param  Request $request
      * @return Response
      */
     public function store($bookSlug, Request $request)
     {

+        $this->checkPermission('chapter-create');

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


@@ -65,52 +60,99 @@ class ChapterController extends Controller
         $book = $this->bookRepo->getBySlug($bookSlug);
         $chapter = $this->chapterRepo->newFromInput($request->all());
         $chapter->slug = $this->chapterRepo->findSuitableSlug($chapter->name, $book->id);
         $book = $this->bookRepo->getBySlug($bookSlug);
         $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;

         $book->chapters()->save($chapter);
         $book->chapters()->save($chapter);

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

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

-     * Display the specified resource.
+     * Display the specified chapter.

      *
      *

-     * @param  int  $id
+     * @param $bookSlug
+     * @param $chapterSlug

      * @return Response
      */
      * @return Response
      */

-    public function show($id)
+    public function show($bookSlug, $chapterSlug)

     {
     {

-        //
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
+        return view('chapters/show', ['book' => $book, 'chapter' => $chapter, 'current' => $chapter]);

     }
 
     /**
     }
 
     /**

-     * Show the form for editing the specified resource.
+     * Show the form for editing the specified chapter.

      *
      *

-     * @param  int  $id
+     * @param $bookSlug
+     * @param $chapterSlug

      * @return Response
      */
      * @return Response
      */

-    public function edit($id)
+    public function edit($bookSlug, $chapterSlug)

     {
     {

-        //
+        $this->checkPermission('chapter-update');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
+        return view('chapters/edit', ['book' => $book, 'chapter' => $chapter, 'current' => $chapter]);

     }
 
     /**
     }
 
     /**

-     * Update the specified resource in storage.
+     * Update the specified chapter in storage.

      *
      *

-     * @param  Request  $request
-     * @param  int  $id
+     * @param  Request $request
+     * @param          $bookSlug
+     * @param          $chapterSlug

      * @return Response
      */
      * @return Response
      */

-    public function update(Request $request, $id)
+    public function update(Request $request, $bookSlug, $chapterSlug)
+    {
+        $this->checkPermission('chapter-update');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $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->save();
+        Activity::add($chapter, 'chapter_update', $book->id);
+        return redirect($chapter->getUrl());
+    }
+
+    /**
+     * Shows the page to confirm deletion of this chapter.
+     * @param $bookSlug
+     * @param $chapterSlug
+     * @return \Illuminate\View\View
+     */
+    public function showDelete($bookSlug, $chapterSlug)

     {
     {

-        //
+        $this->checkPermission('chapter-delete');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
+        return view('chapters/delete', ['book' => $book, 'chapter' => $chapter, 'current' => $chapter]);

     }
 
     /**
     }
 
     /**

-     * Remove the specified resource from storage.
+     * Remove the specified chapter from storage.

      *
      *

-     * @param  int  $id
+     * @param $bookSlug
+     * @param $chapterSlug

      * @return Response
      */
      * @return Response
      */

-    public function destroy($id)
+    public function destroy($bookSlug, $chapterSlug)

     {
     {

-        //
+        $this->checkPermission('chapter-delete');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
+        if (count($chapter->pages) > 0) {
+            foreach ($chapter->pages as $page) {
+                $page->chapter_id = 0;
+                $page->save();
+            }
+        }
+        Activity::removeEntity($chapter);
+        Activity::addMessage('chapter_delete', $book->id, $chapter->name);
+        $chapter->delete();
+        return redirect($book->getUrl());

     }
 }
     }
 }