Skip to content

Provide several more terms-of-use re-acceptance options #7821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
labkey-adam wants to merge 3 commits into
base: release26.7-SNAPSHOT
Choose a base branch
from
Open

Provide several more terms-of-use re-acceptance options #7821

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa054c2
Provide several more terms-of-use re-acceptance options
labkey-adam Jul 7, 2026
259e490
Merge remote-tracking branch 'origin/release26.7-SNAPSHOT' into 26.7_…
labkey-adam Jul 8, 2026
cc3b3fc
Drop-down list population consistency
labkey-adam Jul 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions core/src/org/labkey/core/admin/customizeSite.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*" %>
Expand Down Expand Up @@ -353,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))
Expand Down Expand Up @@ -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))
Expand Down