NOW MANAGED ON CODEBERG
References: Fixed references count/list recycle bin interaction
Dan Browna33dbcb04a7c
diff --git a/app/References/ReferenceFetcher.php b/app/References/ReferenceFetcher.phpindex 655ea7c09..1c9664f45 100644--- a/app/References/ReferenceFetcher.php+++ b/app/References/ReferenceFetcher.php@@ -41,7 +41,8 @@ class ReferenceFetcher{$baseQuery = Reference::query()->where('to_type', '=', $entity->getMorphClass())- ->where('to_id', '=', $entity->id);+ ->where('to_id', '=', $entity->id)+ ->whereHas('from');return $this->permissions->restrictEntityRelationQuery($baseQuery,diff --git a/tests/References/ReferencesTest.php b/tests/References/ReferencesTest.phpindex 715f71435..f8698d028 100644--- a/tests/References/ReferencesTest.php+++ b/tests/References/ReferencesTest.php@@ -271,7 +271,31 @@ class ReferencesTest extends TestCase}}- protected function createReference(Model $from, Model $to)+ public function test_reference_from_deleted_item_does_not_count_or_show_in_references_page()+ {+ $page = $this->entities->page();+ $referencingPageA = $this->entities->page();+ $referencingPageB = $this->entities->page();++ $this->asEditor();+ $this->createReference($referencingPageA, $page);+ $this->createReference($referencingPageB, $page);++ $resp = $this->get($page->getUrl());+ $resp->assertSee('Referenced by 2 items');++ $this->delete($referencingPageA->getUrl());++ $resp = $this->get($page->getUrl());+ $resp->assertSee('Referenced by 1 item');++ $resp = $this->get($page->getUrl('/references'));+ $resp->assertOk();+ $resp->assertSee($referencingPageB->getUrl());+ $resp->assertDontSee($referencingPageA->getUrl());+ }++ protected function createReference(Model $from, Model $to): void{(new Reference())->forceFill(['from_type' => $from->getMorphClass(),