github-mirror/BookStack
github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-04-02 21:59:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prevent duplicate slugs on sort

Browse Source
This commit is contained in:
Dan Brown 2015-11-21 18:11:46 +00:00
parent 61ae96c5f8
commit 3e24b04d00
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/BookController.php
View File

@ -185,7 +185,7 @@ class BookController extends Controller
$isPage = $bookChild->type == 'page'; $isPage = $bookChild->type == 'page';
$bookId = $this->bookRepo->exists($bookChild->book) ? $bookChild->book : $defaultBookId; $bookId = $this->bookRepo->exists($bookChild->book) ? $bookChild->book : $defaultBookId;
$model = $isPage ? $this->pageRepo->getById($id) : $this->chapterRepo->getById($id); $model = $isPage ? $this->pageRepo->getById($id) : $this->chapterRepo->getById($id);
$isPage ? $this->pageRepo->setBookId($bookId, $model) : $this->chapterRepo->setBookId($bookId, $model); $isPage ? $this->pageRepo->changeBook($bookId, $model) : $this->chapterRepo->changeBook($bookId, $model);
$model->priority = $index; $model->priority = $index;
if ($isPage) { if ($isPage) {
$model->chapter_id = ($bookChild->parentChapter === false) ? 0 : $bookChild->parentChapter; $model->chapter_id = ($bookChild->parentChapter === false) ? 0 : $bookChild->parentChapter;

11
app/Repos/ChapterRepo.php
View File

@ -96,7 +96,7 @@ class ChapterRepo
public function doesSlugExist($slug, $bookId, $currentId = false) public function doesSlugExist($slug, $bookId, $currentId = false)
{ {
$query = $this->chapter->where('slug', '=', $slug)->where('book_id', '=', $bookId); $query = $this->chapter->where('slug', '=', $slug)->where('book_id', '=', $bookId);
if($currentId) { if ($currentId) {
$query = $query->where('id', '!=', $currentId); $query = $query->where('id', '!=', $currentId);
} }
return $query->count() > 0; return $query->count() > 0;
@ -113,7 +113,7 @@ class ChapterRepo
public function findSuitableSlug($name, $bookId, $currentId = false) public function findSuitableSlug($name, $bookId, $currentId = false)
{ {
$slug = Str::slug($name); $slug = Str::slug($name);
while($this->doesSlugExist($slug, $bookId, $currentId)) { while ($this->doesSlugExist($slug, $bookId, $currentId)) {
$slug .= '-' . substr(md5(rand(1, 500)), 0, 3); $slug .= '-' . substr(md5(rand(1, 500)), 0, 3);
} }
return $slug; return $slug;
@ -139,18 +139,19 @@ class ChapterRepo
} }
/** /**
* Sets a chapters book id. * Changes the book relation of this chapter.
* @param $bookId * @param $bookId
* @param Chapter $chapter * @param Chapter $chapter
* @return Chapter * @return Chapter
*/ */
public function setBookId($bookId, Chapter $chapter) public function changeBook($bookId, Chapter $chapter)
{ {
$chapter->book_id = $bookId; $chapter->book_id = $bookId;
foreach($chapter->activity as $activity) { foreach ($chapter->activity as $activity) {
$activity->book_id = $bookId; $activity->book_id = $bookId;
$activity->save(); $activity->save();
} }
$chapter->slug = $this->findSuitableSlug($chapter->name, $bookId, $chapter->id);
$chapter->save(); $chapter->save();
return $chapter; return $chapter;
} }

5
app/Repos/PageRepo.php
View File

@ -309,19 +309,20 @@ class PageRepo
} }
/** /**
* Sets the book id for the specified page. * Changes the related book for the specified page.
* Changes the book id of any relations to the page that store the book id. * Changes the book id of any relations to the page that store the book id.
* @param int $bookId * @param int $bookId
* @param Page $page * @param Page $page
* @return Page * @return Page
*/ */
public function setBookId($bookId, Page $page) public function changeBook($bookId, Page $page)
{ {
$page->book_id = $bookId; $page->book_id = $bookId;
foreach ($page->activity as $activity) { foreach ($page->activity as $activity) {
$activity->book_id = $bookId; $activity->book_id = $bookId;
$activity->save(); $activity->save();
} }
$page->slug = $this->findSuitableSlug($page->name, $bookId, $page->id);
$page->save(); $page->save();
return $page; return $page;
} }