Fix: #4900 - cannot disable sublists on individual list page

fisharebest · Nov 4, 2023 · b279675 · b279675
1 parent 821e328
commit b279675
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/Module/IndividualListModule.php b/app/Module/IndividualListModule.php
@@ -409,7 +409,8 @@ public function handle(ServerRequestInterface $request): ResponseInterface
                     $count = array_sum(array_map(static fn(array $x): int => array_sum($x), $all_surnames));
 
                     // Don't sublist short lists.
-                    if ($count < $tree->getPreference('SUBLIST_TRIGGER_I')) {
+                    $sublist_threshold = (int) $tree->getPreference('SUBLIST_TRIGGER_I');
+                    if ($sublist_threshold === 0 || $count < $sublist_threshold) {
                         $falpha = '';
                     } else {
                         // Break long lists by initial letter of given name

diff --git a/resources/views/admin/trees-preferences.phtml b/resources/views/admin/trees-preferences.phtml
@@ -351,10 +351,11 @@ use Illuminate\Support\Collection;
             <input
                 class="form-control"
                 id="SUBLIST_TRIGGER_I"
-                maxlength="5"
+                max="99999"
+                min="0"
                 name="SUBLIST_TRIGGER_I"
                 required
-                type="text"
+                type="number"
                 value="<?= e($tree->getPreference('SUBLIST_TRIGGER_I')) ?>"
             >
             <div class="form-text">