<?php namespace BookStack\Repos;
+use Alpha\B;
use BookStack\Exceptions\NotFoundException;
+use Illuminate\Database\Eloquent\Collection;
use Illuminate\Support\Str;
use BookStack\Book;
use Views;
*/
private function bookQuery()
{
- return $this->restrictionService->enforceBookRestrictions($this->book, 'view');
+ return $this->permissionService->enforceBookRestrictions($this->book, 'view');
}
/**
public function getBySlug($slug)
{
$book = $this->bookQuery()->where('slug', '=', $slug)->first();
- if ($book === null) throw new NotFoundException('Book not found');
+ if ($book === null) throw new NotFoundException(trans('errors.book_not_found'));
return $book;
}
/**
* Get a new book instance from request input.
+ * @param array $input
+ * @return Book
+ */
+ public function createFromInput($input)
+ {
+ $book = $this->book->newInstance($input);
+ $book->slug = $this->findSuitableSlug($book->name);
+ $book->created_by = user()->id;
+ $book->updated_by = user()->id;
+ $book->save();
+ $this->permissionService->buildJointPermissionsForEntity($book);
+ return $book;
+ }
+
+ /**
+ * Update the given book from user input.
+ * @param Book $book
* @param $input
* @return Book
*/
- public function newFromInput($input)
+ public function updateFromInput(Book $book, $input)
{
- return $this->book->newInstance($input);
+ if ($book->name !== $input['name']) {
+ $book->slug = $this->findSuitableSlug($input['name'], $book->id);
+ }
+ $book->fill($input);
+ $book->updated_by = user()->id;
+ $book->save();
+ $this->permissionService->buildJointPermissionsForEntity($book);
+ return $book;
}
/**
- * Destroy a book identified by the given slug.
- * @param $bookSlug
+ * Destroy the given book.
+ * @param Book $book
+ * @throws \Exception
*/
- public function destroyBySlug($bookSlug)
+ public function destroy(Book $book)
{
- $book = $this->getBySlug($bookSlug);
foreach ($book->pages as $page) {
$this->pageRepo->destroy($page);
}
$this->chapterRepo->destroy($chapter);
}
$book->views()->delete();
- $book->restrictions()->delete();
+ $book->permissions()->delete();
+ $this->permissionService->deleteJointPermissionsForEntity($book);
$book->delete();
}
*/
public function findSuitableSlug($name, $currentId = false)
{
- $originalSlug = Str::slug($name);
- $slug = $originalSlug;
- $count = 2;
+ $slug = $this->nameToSlug($name);
while ($this->doesSlugExist($slug, $currentId)) {
- $slug = $originalSlug . '-' . $count;
- $count++;
+ $slug .= '-' . substr(md5(rand(1, 500)), 0, 3);
}
return $slug;
}
/**
* Get all child objects of a book.
* Returns a sorted collection of Pages and Chapters.
- * Loads the bookslug onto child elements to prevent access database access for getting the slug.
+ * Loads the book slug onto child elements to prevent access database access for getting the slug.
* @param Book $book
* @param bool $filterDrafts
* @return mixed
public function getChildren(Book $book, $filterDrafts = false)
{
$pageQuery = $book->pages()->where('chapter_id', '=', 0);
- $pageQuery = $this->restrictionService->enforcePageRestrictions($pageQuery, 'view');
+ $pageQuery = $this->permissionService->enforcePageRestrictions($pageQuery, 'view');
if ($filterDrafts) {
$pageQuery = $pageQuery->where('draft', '=', false);
$pages = $pageQuery->get();
- $chapterQuery = $book->chapters()->with(['pages' => function($query) use ($filterDrafts) {
- $this->restrictionService->enforcePageRestrictions($query, 'view');
+ $chapterQuery = $book->chapters()->with(['pages' => function ($query) use ($filterDrafts) {
+ $this->permissionService->enforcePageRestrictions($query, 'view');
if ($filterDrafts) $query->where('draft', '=', false);
}]);
- $chapterQuery = $this->restrictionService->enforceChapterRestrictions($chapterQuery, 'view');
+ $chapterQuery = $this->permissionService->enforceChapterRestrictions($chapterQuery, 'view');
$chapters = $chapterQuery->get();
- $children = $pages->merge($chapters);
+ $children = $pages->values();
+ foreach ($chapters as $chapter) {
+ $children->push($chapter);
+ }
$bookSlug = $book->slug;
$children->each(function ($child) use ($bookSlug) {
$child->pages->each(function ($page) use ($bookSlug) {
$page->setAttribute('bookSlug', $bookSlug);
});
- $child->pages = $child->pages->sortBy(function($child, $key) {
+ $child->pages = $child->pages->sortBy(function ($child, $key) {
$score = $child->priority;
if ($child->draft) $score -= 100;
return $score;
});
// Sort items with drafts first then by priority.
- return $children->sortBy(function($child, $key) {
+ return $children->sortBy(function ($child, $key) {
$score = $child->priority;
if ($child->isA('page') && $child->draft) $score -= 100;
return $score;
public function getBySearch($term, $count = 20, $paginationAppends = [])
{
$terms = $this->prepareSearchTerms($term);
- $books = $this->restrictionService->enforceBookRestrictions($this->book->fullTextSearchQuery(['name', 'description'], $terms))
- ->paginate($count)->appends($paginationAppends);
+ $bookQuery = $this->permissionService->enforceBookRestrictions($this->book->fullTextSearchQuery(['name', 'description'], $terms));
+ $bookQuery = $this->addAdvancedSearchQueries($bookQuery, $term);
+ $books = $bookQuery->paginate($count)->appends($paginationAppends);
$words = join('|', explode(' ', preg_quote(trim($term), '/')));
foreach ($books as $book) {
//highlight
projects / bookstack / blobdiff