mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-14 17:58:59 +00:00
ALF-9156 Tweak calendar webscripts
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29043 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -262,7 +262,12 @@ public abstract class AbstractCalendarWebScript extends DeclarativeWebScript
|
||||
|
||||
// Parse the JSON, if supplied
|
||||
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
|
||||
{
|
||||
|
@@ -54,7 +54,7 @@ public class UserCalendarEntriesGet extends AbstractCalendarWebScript
|
||||
|
||||
// Site is optional
|
||||
SiteInfo site = null;
|
||||
String siteName = templateVars.get("siteid");
|
||||
String siteName = templateVars.get("site");
|
||||
if(siteName != null)
|
||||
{
|
||||
site = siteService.getSite(siteName);
|
||||
|
Reference in New Issue
Block a user