Skip to content

Commit 94edd21

Browse files
committed
Fix #4700 - "Show all" does not display all individuals in list
1 parent 8634feb commit 94edd21

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

app/Module/IndividualListModule.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,14 +456,21 @@ protected function createResponse(Tree $tree, UserInterface $user, array $params
456456
}
457457
}
458458
if ($show === 'indi') {
459+
/** @var array<string> $surnames */
460+
$surnames = collect($surns)
461+
->map(static fn (array $surn_variants, string $surn_norm): array => array_keys($surn_variants))
462+
->flatten()
463+
->filter(static fn ($surn_variant): bool => is_string($surn_variant) && $surn_variant !== '')
464+
->toArray();
465+
459466
if ($families) {
460467
echo view('lists/families-table', [
461-
'families' => $this->families($tree, $surname, array_keys($all_surnames[$surname] ?? []), $falpha, $show_marnm === 'yes'),
468+
'families' => $this->families($tree, $surname, $surnames, $falpha, $show_marnm === 'yes'),
462469
'tree' => $tree,
463470
]);
464471
} else {
465472
echo view('lists/individuals-table', [
466-
'individuals' => $this->individuals($tree, $surname, array_keys($all_surnames[$surname] ?? []), $falpha, $show_marnm === 'yes', false),
473+
'individuals' => $this->individuals($tree, $surname, $surnames, $falpha, $show_marnm === 'yes', false),
467474
'sosa' => false,
468475
'tree' => $tree,
469476
]);

0 commit comments

Comments
 (0)