inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALF-10978 Correct the handling of "from=now" style dates when listing calendar entries

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32547 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Nick Burch
2011-12-06 01:26:52 +00:00
parent 4fc518cb5f
commit b4c82b3048
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/java/org/alfresco/repo/web/scripts/calendar/AbstractCalendarWebScript.java
View File

@@ -23,6 +23,7 @@ import java.io.Serializable;
import java.io.StringWriter; import java.io.StringWriter;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@@ -112,14 +113,16 @@ public abstract class AbstractCalendarWebScript extends DeclarativeWebScript
return null; return null;
} }
// todays date - ignore time as we want all of today // Today's Date - special case
if (date.equalsIgnoreCase("NOW")) if (date.equalsIgnoreCase("NOW"))
{ {
Date ddate = new Date(); // We want all of today, so go back to midnight
ddate.setHours(0);; Calendar c = Calendar.getInstance();
ddate.setMinutes(0); c.set(Calendar.HOUR_OF_DAY, 0);
ddate.setSeconds(0); c.set(Calendar.MINUTE, 0);
return ddate; c.set(Calendar.SECOND, 0);
c.set(Calendar.MILLISECOND, 0);
return c.getTime();
} }
// Try as ISO8601 // Try as ISO8601