github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-06-06 10:44:33 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Updated page delete to handle inactive custom homepage correctly

Browse Source 
Fixes #1447
This commit is contained in:
Dan Brown
2019-05-27 12:40:19 +01:00
parent 2b7362fa94
commit 3ad1b42a74
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -852,10 +852,13 @@ class EntityRepo
*/ */
public function destroyPage(Page $page) public function destroyPage(Page $page)
{ {
// Check if set as custom homepage // Check if set as custom homepage & remove setting if not used or throw error if active
$customHome = setting('app-homepage', '0:'); $customHome = setting('app-homepage', '0:');
if (intval($page->id) === intval(explode(':', $customHome)[0])) { if (intval($page->id) === intval(explode(':', $customHome)[0])) {
throw new NotifyException(trans('errors.page_custom_home_deletion'), $page->getUrl()); if (setting('app-homepage-type') === 'page') {
throw new NotifyException(trans('errors.page_custom_home_deletion'), $page->getUrl());
}
setting()->remove('app-homepage');
} }
$this->destroyEntityCommonRelations($page); $this->destroyEntityCommonRelations($page);

23
tests/HomepageTest.php
View File

@ -38,10 +38,14 @@ class HomepageTest extends TestCase
$name = 'My custom homepage'; $name = 'My custom homepage';
$content = str_repeat('This is the body content of my custom homepage.', 20); $content = str_repeat('This is the body content of my custom homepage.', 20);
$customPage = $this->newPage(['name' => $name, 'html' => $content]); $customPage = $this->newPage(['name' => $name, 'html' => $content]);
$this->setSettings(['app-homepage' => $customPage->id]); $this->setSettings([
'app-homepage' => $customPage->id,
'app-homepage-type' => 'page'
]);
$homeVisit = $this->get('/'); $homeVisit = $this->get('/');
$homeVisit->assertSee($name); $homeVisit->assertSee($name);
$homeVisit->assertElementNotExists('#home-default');
$pageDeleteReq = $this->delete($customPage->getUrl()); $pageDeleteReq = $this->delete($customPage->getUrl());
$pageDeleteReq->assertStatus(302); $pageDeleteReq->assertStatus(302);
@ -54,6 +58,23 @@ class HomepageTest extends TestCase
$homeVisit->assertStatus(200); $homeVisit->assertStatus(200);
} }
public function test_custom_homepage_can_be_deleted_once_custom_homepage_no_longer_used()
{
$this->asEditor();
$name = 'My custom homepage';
$content = str_repeat('This is the body content of my custom homepage.', 20);
$customPage = $this->newPage(['name' => $name, 'html' => $content]);
$this->setSettings([
'app-homepage' => $customPage->id,
'app-homepage-type' => 'default'
]);
$pageDeleteReq = $this->delete($customPage->getUrl());
$pageDeleteReq->assertStatus(302);
$pageDeleteReq->assertSessionHas('success');
$pageDeleteReq->assertSessionMissing('error');
}
public function test_set_book_homepage() public function test_set_book_homepage()
{ {
$editor = $this->getEditor(); $editor = $this->getEditor();