Merge branch 'master' into translations

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

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index 3390b41c0fac74edec52124d5ee2410e4ddd2710..80a6c24b3c40686e81b1a036fe636eb24ff8d8d9 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -1,17 +1,13 @@
-<?php
-
-namespace BookStack\Http\Controllers;
+<?php namespace BookStack\Http\Controllers;

 
 use Activity;
 use BookStack\Repos\UserRepo;
 use Illuminate\Http\Request;
 
 use Activity;
 use BookStack\Repos\UserRepo;
 use Illuminate\Http\Request;

-
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Str;

 use BookStack\Http\Requests;
 use BookStack\Repos\BookRepo;
 use BookStack\Repos\ChapterRepo;
 use BookStack\Repos\PageRepo;
 use BookStack\Http\Requests;
 use BookStack\Repos\BookRepo;
 use BookStack\Repos\ChapterRepo;
 use BookStack\Repos\PageRepo;

+use Illuminate\Http\Response;

 use Views;
 
 class BookController extends Controller
 use Views;
 
 class BookController extends Controller


@@ -40,7 +36,6 @@ class BookController extends Controller
 
     /**
      * Display a listing of the book.
 
     /**
      * Display a listing of the book.

-     *

      * @return Response
      */
     public function index()
      * @return Response
      */
     public function index()


@@ -54,13 +49,12 @@ class BookController extends Controller
 
     /**
      * Show the form for creating a new book.
 
     /**
      * Show the form for creating a new book.

-     *

      * @return Response
      */
     public function create()
     {
         $this->checkPermission('book-create-all');
      * @return Response
      */
     public function create()
     {
         $this->checkPermission('book-create-all');

-        $this->setPageTitle('Create New Book');
+        $this->setPageTitle(trans('entities.books_create'));

         return view('books/create');
     }
 
         return view('books/create');
     }
 


@@ -77,24 +71,20 @@ class BookController extends Controller
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
         ]);
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
         ]);

-        $book = $this->bookRepo->newFromInput($request->all());
-        $book->slug = $this->bookRepo->findSuitableSlug($book->name);
-        $book->created_by = Auth::user()->id;
-        $book->updated_by = Auth::user()->id;
-        $book->save();
+        $book = $this->bookRepo->createFromInput($request->all());

         Activity::add($book, 'book_create', $book->id);
         return redirect($book->getUrl());
     }
 
     /**
      * Display the specified book.
         Activity::add($book, 'book_create', $book->id);
         return redirect($book->getUrl());
     }
 
     /**
      * Display the specified book.

-     *

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

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

         $bookChildren = $this->bookRepo->getChildren($book);
         Views::add($book);
         $this->setPageTitle($book->getShortName());
         $bookChildren = $this->bookRepo->getChildren($book);
         Views::add($book);
         $this->setPageTitle($book->getShortName());


@@ -103,7 +93,6 @@ class BookController extends Controller
 
     /**
      * Show the form for editing the specified book.
 
     /**
      * Show the form for editing the specified book.

-     *

      * @param $slug
      * @return Response
      */
      * @param $slug
      * @return Response
      */


@@ -111,13 +100,12 @@ class BookController extends Controller
     {
         $book = $this->bookRepo->getBySlug($slug);
         $this->checkOwnablePermission('book-update', $book);
     {
         $book = $this->bookRepo->getBySlug($slug);
         $this->checkOwnablePermission('book-update', $book);

-        $this->setPageTitle('Edit Book ' . $book->getShortName());
+        $this->setPageTitle(trans('entities.books_edit_named',['bookName'=>$book->getShortName()]));

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

-     *

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


@@ -130,10 +118,7 @@ class BookController extends Controller
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
         ]);
             'name' => 'required|string|max:255',
             'description' => 'string|max:1000'
         ]);

-        $book->fill($request->all());
-        $book->slug = $this->bookRepo->findSuitableSlug($book->name, $book->id);
-        $book->updated_by = Auth::user()->id;
-        $book->save();
+        $book = $this->bookRepo->updateFromInput($book, $request->all());

         Activity::add($book, 'book_update', $book->id);
         return redirect($book->getUrl());
     }
         Activity::add($book, 'book_update', $book->id);
         return redirect($book->getUrl());
     }


@@ -147,7 +132,7 @@ class BookController extends Controller
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('book-delete', $book);
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('book-delete', $book);

-        $this->setPageTitle('Delete Book ' . $book->getShortName());
+        $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]);
     }
 


@@ -160,9 +145,9 @@ class BookController extends Controller
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('book-update', $book);
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('book-update', $book);

-        $bookChildren = $this->bookRepo->getChildren($book);
+        $bookChildren = $this->bookRepo->getChildren($book, true);

         $books = $this->bookRepo->getAll(false);
         $books = $this->bookRepo->getAll(false);

-        $this->setPageTitle('Sort Book ' . $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, 'books' => $books, 'bookChildren' => $bookChildren]);
     }
 


@@ -195,21 +180,31 @@ class BookController extends Controller
             return redirect($book->getUrl());
         }
 
             return redirect($book->getUrl());
         }
 

-        $sortedBooks = [];

         // Sort pages and chapters
         // Sort pages and chapters

+        $sortedBooks = [];
+        $updatedModels = collect();

         $sortMap = json_decode($request->get('sort-tree'));
         $defaultBookId = $book->id;
         $sortMap = json_decode($request->get('sort-tree'));
         $defaultBookId = $book->id;

-        foreach ($sortMap as $index => $bookChild) {
-            $id = $bookChild->id;
+
+        // Loop through contents of provided map and update entities accordingly
+        foreach ($sortMap as $bookChild) {
+            $priority = $bookChild->sort;
+            $id = intval($bookChild->id);

             $isPage = $bookChild->type == 'page';
             $isPage = $bookChild->type == 'page';

-            $bookId = $this->bookRepo->exists($bookChild->book) ? $bookChild->book : $defaultBookId;
+            $bookId = $this->bookRepo->exists($bookChild->book) ? intval($bookChild->book) : $defaultBookId;
+            $chapterId = ($isPage && $bookChild->parentChapter === false) ? 0 : intval($bookChild->parentChapter);

             $model = $isPage ? $this->pageRepo->getById($id) : $this->chapterRepo->getById($id);
             $model = $isPage ? $this->pageRepo->getById($id) : $this->chapterRepo->getById($id);

-            $isPage ? $this->pageRepo->changeBook($bookId, $model) : $this->chapterRepo->changeBook($bookId, $model);
-            $model->priority = $index;
-            if ($isPage) {
-                $model->chapter_id = ($bookChild->parentChapter === false) ? 0 : $bookChild->parentChapter;
+
+            // Update models only if there's a change in parent chain or ordering.
+            if ($model->priority !== $priority || $model->book_id !== $bookId || ($isPage && $model->chapter_id !== $chapterId)) {
+                $isPage ? $this->pageRepo->changeBook($bookId, $model) : $this->chapterRepo->changeBook($bookId, $model);
+                $model->priority = $priority;
+                if ($isPage) $model->chapter_id = $chapterId;
+                $model->save();
+                $updatedModels->push($model);

             }
             }

-            $model->save();
+
+            // Store involved books to be sorted later

             if (!in_array($bookId, $sortedBooks)) {
                 $sortedBooks[] = $bookId;
             }
             if (!in_array($bookId, $sortedBooks)) {
                 $sortedBooks[] = $bookId;
             }


@@ -221,6 +216,9 @@ class BookController extends Controller
             Activity::add($updatedBook, 'book_sort', $updatedBook->id);
         }
 
             Activity::add($updatedBook, 'book_sort', $updatedBook->id);
         }
 

+        // Update permissions on changed models
+        $this->bookRepo->buildJointPermissions($updatedModels);
+

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


@@ -235,7 +233,7 @@ class BookController extends Controller
         $this->checkOwnablePermission('book-delete', $book);
         Activity::addMessage('book_delete', 0, $book->name);
         Activity::removeEntity($book);
         $this->checkOwnablePermission('book-delete', $book);
         Activity::addMessage('book_delete', 0, $book->name);
         Activity::removeEntity($book);

-        $this->bookRepo->destroyBySlug($bookSlug);
+        $this->bookRepo->destroy($book);

         return redirect('/books');
     }
 
         return redirect('/books');
     }
 


@@ -266,8 +264,8 @@ class BookController extends Controller
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('restrictions-manage', $book);
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $this->checkOwnablePermission('restrictions-manage', $book);

-        $this->bookRepo->updateRestrictionsFromRequest($request, $book);
-        session()->flash('success', 'Book Restrictions Updated');
+        $this->bookRepo->updateEntityPermissionsFromRequest($request, $book);
+        session()->flash('success', trans('entities.books_permissions_updated'));

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