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

Fixes and performance tweaks to new calendar APIs in relation to fixes merged in rev 30797.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30805 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2011-09-27 13:59:51 +00:00
parent e556b1070f
commit 4a3dedf7b1
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,6 +111,16 @@ public abstract class AbstractCalendarWebScript extends DeclarativeWebScript
return null; return null;
} }
// todays date - ignore time as we want all of today
if (date.equalsIgnoreCase("NOW"))
{
Date ddate = new Date();
ddate.setHours(0);;
ddate.setMinutes(0);
ddate.setSeconds(0);
return ddate;
}
// Try as ISO8601 // Try as ISO8601
try try
{ {

10
source/java/org/alfresco/repo/web/scripts/calendar/UserCalendarEntriesGet.java
View File

@@ -123,8 +123,14 @@ public class UserCalendarEntriesGet extends AbstractCalendarWebScript
} }
else else
{ {
// All their sites // All their sites (with optional limit)
sites = siteService.listSites(AuthenticationUtil.getRunAsUser()); int max = 0;
String strMax = req.getParameter("size");
if (strMax != null && strMax.length() != 0)
{
max = Integer.parseInt(strMax);
}
sites = siteService.listSites(AuthenticationUtil.getRunAsUser(), max);
} }
// We need to know the Site Names, and the NodeRefs of the calendar containers // We need to know the Site Names, and the NodeRefs of the calendar containers