From: Dan Brown Date: Tue, 20 Apr 2021 20:03:44 +0000 (+0100) Subject: Fixed error thrown when owner existed but the creator did not X-Git-Tag: v21.04.2~1^2~3 X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/20528a2442b7149ad8fd1f4cb470062d9ff73b31 Fixed error thrown when owner existed but the creator did not Added test to cover. For #2687 --- diff --git a/resources/views/partials/entity-meta.blade.php b/resources/views/partials/entity-meta.blade.php index 8996df9bb..298cc7c3e 100644 --- a/resources/views/partials/entity-meta.blade.php +++ b/resources/views/partials/entity-meta.blade.php @@ -14,7 +14,7 @@ @endif - @if ($entity->ownedBy && $entity->ownedBy->id !== $entity->createdBy->id) + @if ($entity->ownedBy && $entity->owned_by !== $entity->created_by)
@icon('user'){!! trans('entities.meta_owned_name', [ 'user' => "".e($entity->ownedBy->name). "" diff --git a/tests/Entity/PageTest.php b/tests/Entity/PageTest.php index 4fc6b9c16..615bae21e 100644 --- a/tests/Entity/PageTest.php +++ b/tests/Entity/PageTest.php @@ -6,6 +6,22 @@ use Tests\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() { $this->setSettings(['app-editor' => 'markdown']);