diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2022-03-09 12:37:11 +0000 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2022-03-09 12:37:11 +0000 |
| commit | 4991f2057a6647447a648c5d6743dab00378e98e (patch) | |
| tree | 7cfc1009de6737eee183e04fd540e2358f59193d /app/Http/RequestHandlers/SourcePage.php | |
| parent | 2c7d07c0a3ac029511242a2dacb6c2b86b0e145b (diff) | |
| download | webtrees-4991f2057a6647447a648c5d6743dab00378e98e.tar.gz webtrees-4991f2057a6647447a648c5d6743dab00378e98e.tar.bz2 webtrees-4991f2057a6647447a648c5d6743dab00378e98e.zip | |
Fix: #4250 - refactor linked-records and use consistently
Diffstat (limited to 'app/Http/RequestHandlers/SourcePage.php')
| -rw-r--r-- | app/Http/RequestHandlers/SourcePage.php | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/app/Http/RequestHandlers/SourcePage.php b/app/Http/RequestHandlers/SourcePage.php index 4349a22af2..899cca5026 100644 --- a/app/Http/RequestHandlers/SourcePage.php +++ b/app/Http/RequestHandlers/SourcePage.php @@ -24,6 +24,7 @@ use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Http\ViewResponseTrait; use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Services\ClipboardService; +use Fisharebest\Webtrees\Services\LinkedRecordService; use Fisharebest\Webtrees\Validator; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; @@ -40,14 +41,16 @@ class SourcePage implements RequestHandlerInterface private ClipboardService $clipboard_service; + private LinkedRecordService $linked_record_service; + /** - * SourcePage constructor. - * * @param ClipboardService $clipboard_service + * @param LinkedRecordService $linked_record_service */ - public function __construct(ClipboardService $clipboard_service) + public function __construct(ClipboardService $clipboard_service, LinkedRecordService $linked_record_service) { - $this->clipboard_service = $clipboard_service; + $this->clipboard_service = $clipboard_service; + $this->linked_record_service = $linked_record_service; } /** @@ -68,12 +71,16 @@ class SourcePage implements RequestHandlerInterface return redirect($record->url(), StatusCodeInterface::STATUS_MOVED_PERMANENTLY); } + $linked_locations = $this->linked_record_service->linkedLocations($record); + return $this->viewResponse('record-page', [ 'clipboard_facts' => $this->clipboard_service->pastableFacts($record), - 'linked_families' => $record->linkedFamilies('SOUR'), - 'linked_individuals' => $record->linkedIndividuals('SOUR'), - 'linked_media_objects' => $record->linkedMedia('SOUR'), - 'linked_notes' => $record->linkedNotes('SOUR'), + 'linked_families' => $this->linked_record_service->linkedFamilies($record), + 'linked_individuals' => $this->linked_record_service->linkedIndividuals($record), + 'linked_locations' => $linked_locations->isEmpty() ? null : $linked_locations, + 'linked_media_objects' => $this->linked_record_service->linkedMedia($record), + 'linked_notes' => $this->linked_record_service->linkedNotes($record), + 'linked_repositories' => null, 'linked_sources' => null, 'meta_description' => '', 'meta_robots' => 'index,follow', |
