From b4c82b30482e5b8d6e5201469ddeeaf77d4ef18a Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Tue, 6 Dec 2011 01:26:52 +0000 Subject: [PATCH] ALF-10978 Correct the handling of "from=now" style dates when listing calendar entries git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32547 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../calendar/AbstractCalendarWebScript.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/source/java/org/alfresco/repo/web/scripts/calendar/AbstractCalendarWebScript.java b/source/java/org/alfresco/repo/web/scripts/calendar/AbstractCalendarWebScript.java index 54b8e3551a..5c991610cd 100644 --- a/source/java/org/alfresco/repo/web/scripts/calendar/AbstractCalendarWebScript.java +++ b/source/java/org/alfresco/repo/web/scripts/calendar/AbstractCalendarWebScript.java @@ -23,6 +23,7 @@ import java.io.Serializable; import java.io.StringWriter; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -112,14 +113,16 @@ public abstract class AbstractCalendarWebScript extends DeclarativeWebScript return null; } - // todays date - ignore time as we want all of today + // Today's Date - special case if (date.equalsIgnoreCase("NOW")) { - Date ddate = new Date(); - ddate.setHours(0);; - ddate.setMinutes(0); - ddate.setSeconds(0); - return ddate; + // We want all of today, so go back to midnight + Calendar c = Calendar.getInstance(); + c.set(Calendar.HOUR_OF_DAY, 0); + c.set(Calendar.MINUTE, 0); + c.set(Calendar.SECOND, 0); + c.set(Calendar.MILLISECOND, 0); + return c.getTime(); } // Try as ISO8601