Fix: #4836, Fix: #4837 - parameters for individual list not being passed into links

5 files changed, 21 insertions, 11 deletions

diff --git a/app/Module/IndividualListModule.php b/app/Module/IndividualListModule.php
index f932cf4d7a..b2d40d167d 100644
--- a/app/Module/IndividualListModule.php
+++ b/app/Module/IndividualListModule.php
@@ -370,6 +370,7 @@ class IndividualListModule extends AbstractModule implements ModuleListInterface
                         case 'style1':
                             echo view('lists/surnames-column-list', [
                                 'module'   => $this,
+                                'params'   => ['show' => 'indi'] + $params,
                                 'surnames' => $surns,
                                 'totals'   => true,
                                 'tree'     => $tree,
@@ -378,6 +379,7 @@ class IndividualListModule extends AbstractModule implements ModuleListInterface
                         case 'style3':
                             echo view('lists/surnames-tag-cloud', [
                                 'module'   => $this,
+                                'params'   => ['show' => 'indi'] + $params,
                                 'surnames' => $surns,
                                 'totals'   => true,
                                 'tree'     => $tree,
@@ -389,6 +391,7 @@ class IndividualListModule extends AbstractModule implements ModuleListInterface
                                 'families' => $this->families,
                                 'module'   => $this,
                                 'order'    => [[0, 'asc']],
+                                'params'   => ['show' => 'indi'] + $params,
                                 'surnames' => $surns,
                                 'tree'     => $tree,
                             ]);
diff --git a/app/Module/TopSurnamesModule.php b/app/Module/TopSurnamesModule.php
index bfe8d24069..1fded3c5e1 100644
--- a/app/Module/TopSurnamesModule.php
+++ b/app/Module/TopSurnamesModule.php
@@ -147,6 +147,7 @@ class TopSurnamesModule extends AbstractModule implements ModuleBlockInterface
                 uksort($top_surnames, I18N::comparator());
                 $content = view('lists/surnames-tag-cloud', [
                     'module'   => $module,
+                    'params'   => [],
                     'surnames' => $top_surnames,
                     'totals'   => true,
                     'tree'     => $tree,
@@ -156,6 +157,7 @@ class TopSurnamesModule extends AbstractModule implements ModuleBlockInterface
             case 'list':
                 $content = view('lists/surnames-bullet-list', [
                     'module'   => $module,
+                    'params'   => [],
                     'surnames' => $top_surnames,
                     'totals'   => true,
                     'tree'     => $tree,
@@ -165,6 +167,7 @@ class TopSurnamesModule extends AbstractModule implements ModuleBlockInterface
             case 'array':
                 $content = view('lists/surnames-compact-list', [
                     'module'   => $module,
+                    'params'   => [],
                     'surnames' => $top_surnames,
                     'totals'   => true,
                     'tree'     => $tree,
@@ -178,6 +181,7 @@ class TopSurnamesModule extends AbstractModule implements ModuleBlockInterface
                     'families' => false,
                     'module'   => $module,
                     'order'    => [[1, 'desc']],
+                    'params'   => [],
                     'surnames' => $top_surnames,
                     'tree'     => $tree,
                 ]);
diff --git a/resources/views/lists/surnames-column-list.phtml b/resources/views/lists/surnames-column-list.phtml
index 1f0fe35777..984756ba5d 100644
--- a/resources/views/lists/surnames-column-list.phtml
+++ b/resources/views/lists/surnames-column-list.phtml
@@ -10,6 +10,7 @@ use Fisharebest\Webtrees\Tree;
 
 /**
  * @var IndividualListModule|null $module
+ * @var array<string,string>      $params
  * @var array<array<int>>         $surnames
  * @var bool                      $totals
  * @var Tree                      $tree
@@ -28,17 +29,17 @@ $minimum = min(array_map(static fn (array $x): int => min($x), $surnames));
 
             if ($surn === Individual::NOMEN_NESCIO) {
                 $label = I18N::translateContext('Unknown surname', '…');
-                $url   = $module instanceof ModuleListInterface ? $module->listUrl($tree, ['alpha' => '@']) : '';
+                $url   = $module instanceof ModuleListInterface ? $module->listUrl($tree, ['surname' => $surname] + $params) : '';
             } elseif ($surname === '') {
                 if ($surn === '') {
                     $label = I18N::translate('No surname');
                 } else {
                     $label = e($surn);
                 }
-                $url = $module instanceof ModuleListInterface ? $module->listUrl($tree, ['alpha' => ',']) : '';
+                $url = $module instanceof ModuleListInterface ? $module->listUrl($tree, ['surname' => $surname] + $params) : '';
             } else {
                 $label = e($surname);
-                $url   = $module instanceof ModuleListInterface ? $module->listUrl($tree, ['surname' => $surn]) : '';
+                $url   = $module instanceof ModuleListInterface ? $module->listUrl($tree, ['surname' => $surname] + $params) : '';
             }
 
             if ($totals) {
diff --git a/resources/views/lists/surnames-table.phtml b/resources/views/lists/surnames-table.phtml
index a157ec782c..f49879e029 100644
--- a/resources/views/lists/surnames-table.phtml
+++ b/resources/views/lists/surnames-table.phtml
@@ -11,6 +11,7 @@ use Fisharebest\Webtrees\Tree;
  * @var bool                      $families
  * @var IndividualListModule|null $module
  * @var array<array<int,string>>  $order
+ * @var array<string,string>      $params
  * @var array<array<int>>         $surnames
  * @var Tree                      $tree
  */
@@ -51,15 +52,15 @@ use Fisharebest\Webtrees\Tree;
                     <?php foreach ($surns as $surname => $count) : ?>
                         <?php if ($module instanceof IndividualListModule) : ?>
                             <?php if ($surname === Individual::NOMEN_NESCIO) : ?>
-                                <a href="<?= e($module->listUrl($tree, ['alpha' => '@'])) ?>"><?= I18N::translateContext('Unknown surname', '…') ?></a>
+                                <a href="<?= e($module->listUrl($tree, ['surname' => $surname] + $params)) ?>"><?= I18N::translateContext('Unknown surname', '…') ?></a>
                             <?php elseif ($surname === '') : ?>
                                 <?php if ($surn === '') : ?>
-                                    <a href="<?= e($module->listUrl($tree, ['alpha' => ','])) ?>"><?= I18N::translate('No surname') ?></a>
+                                    <a href="<?= e($module->listUrl($tree, ['surname' => $surname] + $params)) ?>"><?= I18N::translate('No surname') ?></a>
                                 <?php else : ?>
-                                    <a href="<?= e($module->listUrl($tree, ['alpha' => ','])) ?>" class="ut"><?= e($surn) ?></a>
+                                    <a href="<?= e($module->listUrl($tree, ['surname' => $surn] + $params)) ?>" class="ut"><?= e($surn) ?></a>
                                 <?php endif ?>
                             <?php else : ?>
-                                <a href="<?= e($module->listUrl($tree, ['surname' => $surn])) ?>" class="ut"><?= e($surname) ?></a>
+                                <a href="<?= e($module->listUrl($tree, ['surname' => $surname] + $params)) ?>" class="ut"><?= e($surname) ?></a>
                             <?php endif ?>
                         <?php else : ?>
                             <?php if ($surname === Individual::NOMEN_NESCIO) : ?>
diff --git a/resources/views/lists/surnames-tag-cloud.phtml b/resources/views/lists/surnames-tag-cloud.phtml
index 825e545b77..0461673724 100644
--- a/resources/views/lists/surnames-tag-cloud.phtml
+++ b/resources/views/lists/surnames-tag-cloud.phtml
@@ -10,6 +10,7 @@ use Fisharebest\Webtrees\Tree;
 
 /**
  * @var IndividualListModule|null $module
+ * @var array<string,string>      $params
  * @var array<array<int>>         $surnames
  * @var bool                      $totals
  * @var Tree                      $tree
@@ -22,12 +23,12 @@ $minimum = min(array_map(static fn (array $x): int => min($x), $surnames));
 
 <div class="wt-surnames-tag-cloud">
     <?php foreach ($surnames as $surn => $surns) : ?>
-        <?php foreach ($surns as $spfxsurn => $count) : ?>
+        <?php foreach ($surns as $surname => $count) : ?>
             <?php
             $size = $maximum === $minimum ? 1.0 : 1.0 + 1.5 * ($count - $minimum) / ($maximum - $minimum);
 
-            if ($spfxsurn !== '') {
-                $label = e($spfxsurn);
+            if ($surname !== '') {
+                $label = e($surname);
             } elseif ($surn !== Individual::NOMEN_NESCIO) {
                 $label = e($surn);
             } else {
@@ -40,7 +41,7 @@ $minimum = min(array_map(static fn (array $x): int => min($x), $surnames));
 
             ?>
             <?php if ($module instanceof ModuleListInterface) : ?>
-                <a class="ut" style="font-size:<?= $size ?>rem" href="<?= e($module->listUrl($tree, ['surname' => $surn])) ?>">
+                <a class="ut" style="font-size:<?= $size ?>rem" href="<?= e($module->listUrl($tree, ['surname' => $surname] + $params)) ?>">
                     <?= $label ?>
                 </a>
             <?php else : ?>