Replace dots with something else on user create and edit screens

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

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index 65f97b8c984e43272e448c49b6b0564e04548e2c..9eb19ce655326e135e46c51df5d60cc733052b0c 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -3,6 +3,7 @@
 use Activity;
 use BookStack\Auth\UserRepo;
 use BookStack\Entities\Book;
 use Activity;
 use BookStack\Auth\UserRepo;
 use BookStack\Entities\Book;

+use BookStack\Entities\EntityContextManager;

 use BookStack\Entities\Repos\EntityRepo;
 use BookStack\Entities\ExportService;
 use Illuminate\Http\Request;
 use BookStack\Entities\Repos\EntityRepo;
 use BookStack\Entities\ExportService;
 use Illuminate\Http\Request;


@@ -15,18 +16,25 @@ class BookController extends Controller
     protected $entityRepo;
     protected $userRepo;
     protected $exportService;
     protected $entityRepo;
     protected $userRepo;
     protected $exportService;

+    protected $entityContextManager;

 
     /**
      * BookController constructor.
      * @param EntityRepo $entityRepo
 
     /**
      * BookController constructor.
      * @param EntityRepo $entityRepo

-     * @param \BookStack\Auth\UserRepo $userRepo
-     * @param \BookStack\Entities\ExportService $exportService
+     * @param UserRepo $userRepo
+     * @param ExportService $exportService
+     * @param EntityContextManager $entityContextManager

      */
      */

-    public function __construct(EntityRepo $entityRepo, UserRepo $userRepo, ExportService $exportService)
-    {
+    public function __construct(
+        EntityRepo $entityRepo,
+        UserRepo $userRepo,
+        ExportService $exportService,
+        EntityContextManager $entityContextManager
+    ) {

         $this->entityRepo = $entityRepo;
         $this->userRepo = $userRepo;
         $this->exportService = $exportService;
         $this->entityRepo = $entityRepo;
         $this->userRepo = $userRepo;
         $this->exportService = $exportService;

+        $this->entityContextManager = $entityContextManager;

         parent::__construct();
     }
 
         parent::__construct();
     }
 


@@ -50,8 +58,10 @@ class BookController extends Controller
         $popular = $this->entityRepo->getPopular('book', 4, 0);
         $new = $this->entityRepo->getRecentlyCreated('book', 4, 0);
 
         $popular = $this->entityRepo->getPopular('book', 4, 0);
         $new = $this->entityRepo->getRecentlyCreated('book', 4, 0);
 

+        $this->entityContextManager->clearShelfContext();
+

         $this->setPageTitle(trans('entities.books'));
         $this->setPageTitle(trans('entities.books'));

-        return view('books/index', [
+        return view('books.index', [

             'books' => $books,
             'recents' => $recents,
             'popular' => $popular,
             'books' => $books,
             'recents' => $recents,
             'popular' => $popular,


@@ -71,7 +81,7 @@ class BookController extends Controller
     {
         $this->checkPermission('book-create-all');
         $this->setPageTitle(trans('entities.books_create'));
     {
         $this->checkPermission('book-create-all');
         $this->setPageTitle(trans('entities.books_create'));

-        return view('books/create');
+        return view('books.create');

     }
 
     /**
     }
 
     /**


@@ -95,16 +105,24 @@ class BookController extends Controller
     /**
      * Display the specified book.
      * @param $slug
     /**
      * Display the specified book.
      * @param $slug

+     * @param Request $request

      * @return Response
      * @return Response

+     * @throws \BookStack\Exceptions\NotFoundException

      */
      */

-    public function show($slug)
+    public function show($slug, Request $request)

     {
         $book = $this->entityRepo->getBySlug('book', $slug);
         $this->checkOwnablePermission('book-view', $book);
     {
         $book = $this->entityRepo->getBySlug('book', $slug);
         $this->checkOwnablePermission('book-view', $book);

+

         $bookChildren = $this->entityRepo->getBookChildren($book);
         $bookChildren = $this->entityRepo->getBookChildren($book);

+

         Views::add($book);
         Views::add($book);

+        if ($request->has('shelf')) {
+            $this->entityContextManager->setShelfContext(intval($request->get('shelf')));
+        }
+

         $this->setPageTitle($book->getShortName());
         $this->setPageTitle($book->getShortName());

-        return view('books/show', [
+        return view('books.show', [

             'book' => $book,
             'current' => $book,
             'bookChildren' => $bookChildren,
             'book' => $book,
             'current' => $book,
             'bookChildren' => $bookChildren,


@@ -122,7 +140,7 @@ class BookController extends Controller
         $book = $this->entityRepo->getBySlug('book', $slug);
         $this->checkOwnablePermission('book-update', $book);
         $this->setPageTitle(trans('entities.books_edit_named', ['bookName'=>$book->getShortName()]));
         $book = $this->entityRepo->getBySlug('book', $slug);
         $this->checkOwnablePermission('book-update', $book);
         $this->setPageTitle(trans('entities.books_edit_named', ['bookName'=>$book->getShortName()]));

-        return view('books/edit', ['book' => $book, 'current' => $book]);
+        return view('books.edit', ['book' => $book, 'current' => $book]);

     }
 
     /**
     }
 
     /**


@@ -154,22 +172,24 @@ class BookController extends Controller
         $book = $this->entityRepo->getBySlug('book', $bookSlug);
         $this->checkOwnablePermission('book-delete', $book);
         $this->setPageTitle(trans('entities.books_delete_named', ['bookName'=>$book->getShortName()]));
         $book = $this->entityRepo->getBySlug('book', $bookSlug);
         $this->checkOwnablePermission('book-delete', $book);
         $this->setPageTitle(trans('entities.books_delete_named', ['bookName'=>$book->getShortName()]));

-        return view('books/delete', ['book' => $book, 'current' => $book]);
+        return view('books.delete', ['book' => $book, 'current' => $book]);

     }
 
     /**
      * Shows the view which allows pages to be re-ordered and sorted.
      * @param string $bookSlug
      * @return \Illuminate\View\View
     }
 
     /**
      * Shows the view which allows pages to be re-ordered and sorted.
      * @param string $bookSlug
      * @return \Illuminate\View\View

+     * @throws \BookStack\Exceptions\NotFoundException

      */
     public function sort($bookSlug)
     {
         $book = $this->entityRepo->getBySlug('book', $bookSlug);
         $this->checkOwnablePermission('book-update', $book);
      */
     public function sort($bookSlug)
     {
         $book = $this->entityRepo->getBySlug('book', $bookSlug);
         $this->checkOwnablePermission('book-update', $book);

+

         $bookChildren = $this->entityRepo->getBookChildren($book, true);
         $bookChildren = $this->entityRepo->getBookChildren($book, true);

-        $books = $this->entityRepo->getAll('book', false, 'update');
+

         $this->setPageTitle(trans('entities.books_sort_named', ['bookName'=>$book->getShortName()]));
         $this->setPageTitle(trans('entities.books_sort_named', ['bookName'=>$book->getShortName()]));

-        return view('books/sort', ['book' => $book, 'current' => $book, 'books' => $books, 'bookChildren' => $bookChildren]);
+        return view('books.sort', ['book' => $book, 'current' => $book, 'bookChildren' => $bookChildren]);

     }
 
     /**
     }
 
     /**


@@ -182,7 +202,7 @@ class BookController extends Controller
     {
         $book = $this->entityRepo->getBySlug('book', $bookSlug);
         $bookChildren = $this->entityRepo->getBookChildren($book);
     {
         $book = $this->entityRepo->getBySlug('book', $bookSlug);
         $bookChildren = $this->entityRepo->getBookChildren($book);

-        return view('books/sort-box', ['book' => $book, 'bookChildren' => $bookChildren]);
+        return view('books.sort-box', ['book' => $book, 'bookChildren' => $bookChildren]);

     }
 
     /**
     }
 
     /**