Fixes #45

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

diff --git a/app/Http/Controllers/ChapterController.php b/app/Http/Controllers/ChapterController.php
index 98e7a66781ba978e2b092346ba01fb93c6c59143..fc13e8b58b777a24584cd59f01a6020fa74eee95 100644 (file)
--- a/app/Http/Controllers/ChapterController.php
+++ b/app/Http/Controllers/ChapterController.php
@@ -1,15 +1,16 @@
 <?php
 
 <?php
 

-namespace Oxbow\Http\Controllers;
+namespace BookStack\Http\Controllers;

 
 use Activity;
 use Illuminate\Http\Request;
 
 use Illuminate\Support\Facades\Auth;
 
 use Activity;
 use Illuminate\Http\Request;
 
 use Illuminate\Support\Facades\Auth;

-use Oxbow\Http\Requests;
-use Oxbow\Http\Controllers\Controller;
-use Oxbow\Repos\BookRepo;
-use Oxbow\Repos\ChapterRepo;
+use BookStack\Http\Requests;
+use BookStack\Http\Controllers\Controller;
+use BookStack\Repos\BookRepo;
+use BookStack\Repos\ChapterRepo;
+use Views;

 
 class ChapterController extends Controller
 {
 
 class ChapterController extends Controller
 {


@@ -32,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
      */


@@ -40,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


@@ -61,16 +61,15 @@ 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);
         $book->chapters()->save($chapter);
         Activity::add($chapter, 'chapter_create', $book->id);

-        return redirect($book->getUrl());
+        return redirect($chapter->getUrl());

     }
 
     /**
      * Display the specified chapter.
     }
 
     /**
      * Display the specified chapter.

-     *

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


@@ -79,12 +78,14 @@ class ChapterController extends Controller
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);

-        return view('chapters/show', ['book' => $book, 'chapter' => $chapter, 'current' => $chapter]);
+        $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.
     }
 
     /**
      * Show the form for editing the specified chapter.

-     *

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


@@ -94,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


@@ -112,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());


@@ -129,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


@@ -144,15 +145,8 @@ 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);

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

-        $chapter->delete();
+        $this->chapterRepo->destroy($chapter);

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