Skip to content
Snippets Groups Projects
Commit a7ba4978 authored by Karsten Loesing's avatar Karsten Loesing
Browse files

Default date picker to latest available date. 

Implements #30260.
parent 639b9ebd
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
CHANGELOG.md
+ 3
− 0
View file @ a7ba4978
# Changes in version 4.?.? - 2020-0?-??
* Medium changes
- Default date picker to latest available date.
# Changes in version 4.3.0 - 2020-01-15
......
......
src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
+ 5
− 1
View file @ a7ba4978
......@@ -16,6 +16,7 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.net.URL;
import java.time.LocalDate;
import java.time.ZoneOffset;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
......@@ -150,12 +151,15 @@ public class ExoneraTorServlet extends HttpServlet {
? (baseUrl + requestUri) : request.getRequestURL().toString();
/* Write form. */
String defaultDateString = LocalDate.now(ZoneOffset.UTC)
.minusDays(2).toString();
boolean timestampOutOfRange = requestedDate.valid
&& (firstDate.valid && requestedDate.date.isBefore(firstDate.date)
|| (lastDate.valid && requestedDate.date.isAfter(lastDate.date)));
this.writeForm(out, rb, relayIp, relayIpHasError
|| ("".equals(relayIp) && !requestedDate.empty),
requestedDate.asString, !relayIpHasError
requestedDate.valid ? requestedDate.asString : defaultDateString,
!relayIpHasError
&& !("".equals(relayIp) && !requestedDate.valid)
&& (!requestedDate.valid || timestampOutOfRange
|| (!"".equals(relayIp) && requestedDate.empty)), langStr);
......
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment