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

Merge branch 'feature_move_page_into_chapter' of git://github.com/philjak/BookStack into philjak-feature_move_page_into_chapter

Browse Source
This commit is contained in:
Dan Brown 2019-10-29 22:26:11 +00:00
commit e108808a32
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Entities/Repos/PageRepo.php
View File

@ -306,9 +306,14 @@ class PageRepo
throw new PermissionsException('User does not have permission to create a page within the new parent'); throw new PermissionsException('User does not have permission to create a page within the new parent');
} }
if ($parent instanceof Chapter) {
$page->chapter_id = $parent->id;
}
$page->changeBook($parent instanceof Book ? $parent->id : $parent->book->id); $page->changeBook($parent instanceof Book ? $parent->id : $parent->book->id);
$page->rebuildPermissions(); $page->rebuildPermissions();
return $parent;
return ($parent instanceof Book ? $parent : $parent->book);
} }
/** /**