From 94edd21911ffc6989726743d12db55d504c34415 Mon Sep 17 00:00:00 2001 From: Jonathan Jaubart Date: Sun, 29 Jan 2023 20:20:28 +0000 Subject: [PATCH] Fix #4700 - "Show all" does not display all individuals in list --- app/Module/IndividualListModule.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/Module/IndividualListModule.php b/app/Module/IndividualListModule.php index 7cdaf4f0160..fc7bcd2bc86 100644 --- a/app/Module/IndividualListModule.php +++ b/app/Module/IndividualListModule.php @@ -456,14 +456,21 @@ protected function createResponse(Tree $tree, UserInterface $user, array $params } } if ($show === 'indi') { + /** @var array $surnames */ + $surnames = collect($surns) + ->map(static fn (array $surn_variants, string $surn_norm): array => array_keys($surn_variants)) + ->flatten() + ->filter(static fn ($surn_variant): bool => is_string($surn_variant) && $surn_variant !== '') + ->toArray(); + if ($families) { echo view('lists/families-table', [ - 'families' => $this->families($tree, $surname, array_keys($all_surnames[$surname] ?? []), $falpha, $show_marnm === 'yes'), + 'families' => $this->families($tree, $surname, $surnames, $falpha, $show_marnm === 'yes'), 'tree' => $tree, ]); } else { echo view('lists/individuals-table', [ - 'individuals' => $this->individuals($tree, $surname, array_keys($all_surnames[$surname] ?? []), $falpha, $show_marnm === 'yes', false), + 'individuals' => $this->individuals($tree, $surname, $surnames, $falpha, $show_marnm === 'yes', false), 'sosa' => false, 'tree' => $tree, ]);