Fix #4700 - "Show all" does not display all individuals in list

fisharebest · Jan 29, 2023 · 94edd21 · 94edd21
1 parent 8634feb
commit 94edd21
Showing 1 changed file with 9 additions and 2 deletions.
diff --git 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<string> $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,
                             ]);