From 4daeb9daa6c980d97126293c972245d8e08711e8 Mon Sep 17 00:00:00 2001
From: jakob <jakob@mpib-berlin.mpg.de>
Date: Mon, 28 Oct 2019 15:33:28 +0100
Subject: [PATCH 1/2] Check if parent is a chapter. If so, move into Book and
assing page to chapter.
---
app/Entities/Repos/PageRepo.php | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index 0fc68f953..5d6fc8fa8 100644
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -306,6 +306,13 @@ class PageRepo
throw new PermissionsException('User does not have permission to create a page within the new parent');
}
+ if ($parent instanceof Chapter) {
+ $parentChapter = $parent;
+ $parent = $parent->book;
+ $page->chapter_id = $parentChapter->id;
+ $page->save();
+ }
+
$page->changeBook($parent instanceof Book ? $parent->id : $parent->book->id);
$page->rebuildPermissions();
return $parent;
From 7368ff3e6a00af5d9062d44172c6f45415277605 Mon Sep 17 00:00:00 2001
From: jakob <jakob@mpib-berlin.mpg.de>
Date: Mon, 28 Oct 2019 16:53:48 +0100
Subject: [PATCH 2/2] No need to save page
---
app/Entities/Repos/PageRepo.php | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index 5d6fc8fa8..501b19c78 100644
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -307,15 +307,13 @@ class PageRepo
}
if ($parent instanceof Chapter) {
- $parentChapter = $parent;
- $parent = $parent->book;
- $page->chapter_id = $parentChapter->id;
- $page->save();
+ $page->chapter_id = $parent->id;
}
$page->changeBook($parent instanceof Book ? $parent->id : $parent->book->id);
$page->rebuildPermissions();
- return $parent;
+
+ return ($parent instanceof Book ? $parent : $parent->book);
}
/**