Added basic system tests for markdown editor, Added extra test helpers

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

diff --git a/app/Http/Controllers/ChapterController.php b/app/Http/Controllers/ChapterController.php
index 12bbeeab04a636a0aa1bd62b36032550f6c2e5a8..6b8a2f18fc8aa9af8a1fb15f0decb239754f49ad 100644 (file)
--- a/app/Http/Controllers/ChapterController.php
+++ b/app/Http/Controllers/ChapterController.php
@@ -1,50 +1,50 @@
-<?php
-
-namespace Oxbow\Http\Controllers;
+<?php namespace BookStack\Http\Controllers;

 
 use Activity;
 
 use Activity;

+use BookStack\Repos\UserRepo;

 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\Repos\ChapterRepo;
+use BookStack\Http\Requests;
+use BookStack\Repos\BookRepo;
+use BookStack\Repos\ChapterRepo;
+use Views;

 
 class ChapterController extends Controller
 {
 
     protected $bookRepo;
     protected $chapterRepo;
 
 class ChapterController extends Controller
 {
 
     protected $bookRepo;
     protected $chapterRepo;

+    protected $userRepo;

 
     /**
      * ChapterController constructor.
 
     /**
      * ChapterController constructor.

-     * @param $bookRepo
-     * @param $chapterRepo
+     * @param BookRepo $bookRepo
+     * @param ChapterRepo $chapterRepo
+     * @param UserRepo $userRepo

      */
      */

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

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

+        $this->userRepo = $userRepo;
+        parent::__construct();

     }
     }

-    

 
     /**
      * Show the form for creating a new chapter.
 
     /**
      * Show the form for creating a new chapter.

-     *

      * @param $bookSlug
      * @return Response
      */
     public function create($bookSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
      * @param $bookSlug
      * @return Response
      */
     public function create($bookSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);

+        $this->checkOwnablePermission('chapter-create', $book);
+        $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          $bookSlug

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


@@ -55,19 +55,20 @@ class ChapterController extends Controller
         ]);
 
         $book = $this->bookRepo->getBySlug($bookSlug);
         ]);
 
         $book = $this->bookRepo->getBySlug($bookSlug);

+        $this->checkOwnablePermission('chapter-create', $book);
+

         $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


@@ -76,12 +77,21 @@ 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());
+        $pages = $this->chapterRepo->getChildren($chapter);
+        return view('chapters/show', [
+            'book' => $book,
+            'chapter' => $chapter,
+            'current' => $chapter,
+            'sidebarTree' => $sidebarTree,
+            'pages' => $pages
+        ]);

     }
 
     /**
      * 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


@@ -90,24 +100,26 @@ 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);

+        $this->checkOwnablePermission('chapter-update', $chapter);
+        $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  Request $request

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

      * @return Response
      */
     public function update(Request $request, $bookSlug, $chapterSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
      * @return Response
      */
     public function update(Request $request, $bookSlug, $chapterSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);

+        $this->checkOwnablePermission('chapter-update', $chapter);

         $chapter->fill($request->all());
         $chapter->slug = $this->chapterRepo->findSuitableSlug($chapter->name, $book->id, $chapter->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());


@@ -123,12 +135,13 @@ 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);

+        $this->checkOwnablePermission('chapter-delete', $chapter);
+        $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


@@ -137,15 +150,44 @@ 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);

-        if(count($chapter->pages) > 0) {
-            foreach($chapter->pages as $page) {
-                $page->chapter_id = 0;
-                $page->save();
-            }
-        }
-        Activity::removeEntity($chapter);
+        $this->checkOwnablePermission('chapter-delete', $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());
     }

+
+    /**
+     * Show the Restrictions view.
+     * @param $bookSlug
+     * @param $chapterSlug
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function showRestrict($bookSlug, $chapterSlug)
+    {
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
+        $this->checkOwnablePermission('restrictions-manage', $chapter);
+        $roles = $this->userRepo->getRestrictableRoles();
+        return view('chapters/restrictions', [
+            'chapter' => $chapter,
+            'roles' => $roles
+        ]);
+    }
+
+    /**
+     * Set the restrictions for this chapter.
+     * @param $bookSlug
+     * @param $chapterSlug
+     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function restrict($bookSlug, $chapterSlug, Request $request)
+    {
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id);
+        $this->checkOwnablePermission('restrictions-manage', $chapter);
+        $this->chapterRepo->updateRestrictionsFromRequest($request, $chapter);
+        session()->flash('success', 'Page Restrictions Updated');
+        return redirect($chapter->getUrl());
+    }

 }
 }