From fa054c204fa13459c87e0b62c0e0e587cb817cbd Mon Sep 17 00:00:00 2001
From: Adam Rauch <adam@labkey.com>
Date: Tue, 7 Jul 2026 14:17:28 -0700
Subject: [PATCH 1/2] Provide several more terms-of-use re-acceptance options

---
 core/src/org/labkey/core/admin/customizeSite.jsp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/org/labkey/core/admin/customizeSite.jsp b/core/src/org/labkey/core/admin/customizeSite.jsp
index 398a6a0a131..7a0fabbd8c1 100644
--- a/core/src/org/labkey/core/admin/customizeSite.jsp
+++ b/core/src/org/labkey/core/admin/customizeSite.jsp
@@ -34,6 +34,7 @@
 <%@ page import="java.util.Map" %>
 <%@ page import="java.util.Objects" %>
 <%@ page import="java.util.TreeMap" %>
+<%@ page import="java.util.stream.Stream" %>
 <%@ page import="static org.labkey.api.security.SecurityManager.SECONDS_PER_DAY" %>
 <%@ page import="static org.labkey.api.util.ExceptionReportingLevel.*" %>
 <%@ page import="static org.labkey.api.settings.SiteSettingsProperties.*" %>
@@ -392,8 +393,8 @@ Click the Save button at any time to accept the current settings and continue.</
     if (appProps.isDevMode())
         termsFrequencyOptions.put(60, "Once a minute"); // For testing
     termsFrequencyOptions.put(SECONDS_PER_DAY, "Once a day");
-    termsFrequencyOptions.put(7 * SECONDS_PER_DAY, "Every 7 days");
-    termsFrequencyOptions.put(30 * SECONDS_PER_DAY, "Every 30 days");
+    Stream.of(7, 30, 90, 180, 365)
+        .forEach(days -> termsFrequencyOptions.put(days * SECONDS_PER_DAY, "Every " + days + " days"));
 
     // If current value is non-standard (perhaps set by a startup property) then add it, formatting label as a duration
     if (!termsFrequencyOptions.containsKey(currentTermsFrequency))

From cc3b3fc95fb3535ec1a45bc2317e66e3eb384a54 Mon Sep 17 00:00:00 2001
From: Adam Rauch <adam@labkey.com>
Date: Tue, 7 Jul 2026 20:32:30 -0700
Subject: [PATCH 2/2] Drop-down list population consistency

---
 core/src/org/labkey/core/admin/customizeSite.jsp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/org/labkey/core/admin/customizeSite.jsp b/core/src/org/labkey/core/admin/customizeSite.jsp
index 7a0fabbd8c1..d5cb0450bd2 100644
--- a/core/src/org/labkey/core/admin/customizeSite.jsp
+++ b/core/src/org/labkey/core/admin/customizeSite.jsp
@@ -354,8 +354,8 @@ Click the Save button at any time to accept the current settings and continue.</
     {
         expirationOptions.put(10, "10 seconds - for testing purposes only");
     }
-    for (int days : new int[]{7, 30, 90, 180, 365})
-        expirationOptions.put(days * SECONDS_PER_DAY, days + " days");
+    Stream.of(7, 30, 90, 180, 365)
+        .forEach(days -> expirationOptions.put(days * SECONDS_PER_DAY, days + " days"));
 
     // If current expiration is non-standard (perhaps set by a startup property) then add it, formatting label as a duration
     if (!expirationOptions.containsKey(currentExpiration))