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-9156 Tweak calendar webscripts

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29043 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Nick Burch
2011-07-14 15:42:06 +00:00
parent 70669e3136
commit 44dbe4a189
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -262,7 +262,12 @@ public abstract class AbstractCalendarWebScript extends DeclarativeWebScript
// Parse the JSON, if supplied // Parse the JSON, if supplied
JSONObject json = null; JSONObject json = null;
if(MimetypeMap.MIMETYPE_JSON.equals( req.getContentType() )) String contentType = req.getContentType();
if(contentType != null && contentType.indexOf(';') != -1)
{
contentType = contentType.substring(0, contentType.indexOf(';'));
}
if(MimetypeMap.MIMETYPE_JSON.equals(contentType))
{ {
try try
{ {

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

@@ -54,7 +54,7 @@ public class UserCalendarEntriesGet extends AbstractCalendarWebScript
// Site is optional // Site is optional
SiteInfo site = null; SiteInfo site = null;
String siteName = templateVars.get("siteid"); String siteName = templateVars.get("site");
if(siteName != null) if(siteName != null)
{ {
site = siteService.getSite(siteName); site = siteService.getSite(siteName);