]> BookStack Code Mirror - bookstack/commitdiff
Fixed error thrown when owner existed but the creator did not
authorDan Brown <redacted>
Tue, 20 Apr 2021 20:03:44 +0000 (21:03 +0100)
committerDan Brown <redacted>
Tue, 20 Apr 2021 20:04:38 +0000 (21:04 +0100)
Added test to cover.
For #2687

resources/views/partials/entity-meta.blade.php
tests/Entity/PageTest.php

index 8996df9bb67d0f491d9a8de5e5d18b56560883fb..298cc7c3e421750c6ec9669b2fcd9fb0a229f319 100644 (file)
@@ -14,7 +14,7 @@
         </div>
     @endif
 
-    @if ($entity->ownedBy && $entity->ownedBy->id !== $entity->createdBy->id)
+    @if ($entity->ownedBy && $entity->owned_by !== $entity->created_by)
         <div>
             @icon('user'){!! trans('entities.meta_owned_name', [
             'user' => "<a href='{$entity->ownedBy->getProfileUrl()}'>".e($entity->ownedBy->name). "</a>"
index 4fc6b9c16175b992cd5784ca5c7cd5729118b1fe..615bae21eb6f6940c6d0cc54adab25369c55ed61 100644 (file)
@@ -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']);