Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-30 07:32:39 +01:00
Code Issues Releases Wiki Activity

Fixed error thrown when owner existed but the creator did not

Browse Source 
Added test to cover.
For #2687
This commit is contained in:
Dan Brown 2021-04-20 21:03:44 +01:00
parent b3c47649b4
commit 20528a2442
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/partials/entity-meta.blade.php
View File

@ -14,7 +14,7 @@
</div> </div>
@endif @endif
@if ($entity->ownedBy && $entity->ownedBy->id !== $entity->createdBy->id) @if ($entity->ownedBy && $entity->owned_by !== $entity->created_by)
<div> <div>
@icon('user'){!! trans('entities.meta_owned_name', [ @icon('user'){!! trans('entities.meta_owned_name', [
'user' => "<a href='{$entity->ownedBy->getProfileUrl()}'>".e($entity->ownedBy->name). "</a>" 'user' => "<a href='{$entity->ownedBy->getProfileUrl()}'>".e($entity->ownedBy->name). "</a>"

16
tests/Entity/PageTest.php
View File

@ -6,6 +6,22 @@ use Tests\TestCase;
class PageTest extends TestCase class PageTest extends TestCase
{ {
public function test_page_view_when_creator_is_deleted_but_owner_exists()
{
$page = Page::query()->first();
$user = $this->getViewer();
$owner = $this->getEditor();
$page->created_by = $user->id;
$page->owned_by = $owner->id;
$page->save();
$user->delete();
$resp = $this->asAdmin()->get($page->getUrl());
$resp->assertStatus(200);
$resp->assertSeeText('Owned by ' . $owner->name);
}
public function test_page_creation_with_markdown_content() public function test_page_creation_with_markdown_content()
{ {
$this->setSettings(['app-editor' => 'markdown']); $this->setSettings(['app-editor' => 'markdown']);