diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.get.js b/config/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.get.js index 032b45fdd1..512dab51d4 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.get.js +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.get.js @@ -10,8 +10,7 @@ function main() + " could not be found"); return; } - - var preferences = null; + try { // Get the preferences for the person diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.delete.js b/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.delete.js index 1eb10784ea..6bec6dafbc 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.delete.js +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.delete.js @@ -5,17 +5,35 @@ function main() // Get the site var site = siteService.getSite(shortName); - if (site != null) - { - // Delete the site - site.deleteSite(); - } - else + if (site == null) { // Return 404 status.setCode(404, "The site " + shortName + " does not exist"); return; } + try + { + // Delete the site + site.deleteSite(); + } + catch (error) + { + var msg = error.message; + + // determine if the exception was AlfrescoRuntimeException, if so + // return 409 status code + if (msg.indexOf("NodeLockedException") != -1) + { + status.setCode(status.STATUS_CONFLICT, msg); + } + else + { + // We don't need to check for SiteServiceException thrown as a result of + // not existing site, because this is handled above. + status.setCode(status.STATUS_INTERNAL_SERVER_ERROR, msg); //return 500 + } + return; + } } -main(); \ No newline at end of file +main(); \ No newline at end of file diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/item.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/item.lib.ftl index ed47b07bc1..d4ccfefbb0 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/item.lib.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/item.lib.ftl @@ -1,7 +1,7 @@ <#macro itemJSON item> <#local node = item.node> <#local version = "1.0"> - <#if node.hasAspect("cm:versionable")><#local version = node.properties["cm:versionLabel"]> + <#if node.hasAspect("cm:versionable")><#local version = node.properties["cm:versionLabel"]!""> <#escape x as jsonUtils.encodeJSONString(x)> "version": "${version}", "webdavUrl": "${node.webdavUrl}", diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/item.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/item.lib.ftl index 5ad3dabfab..526782eecf 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/item.lib.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/item.lib.ftl @@ -6,7 +6,7 @@ <#escape x as jsonUtils.encodeJSONString(x)> <#local node = item.node> <#local version = "1.0"> - <#if node.hasAspect("cm:versionable")><#local version = node.properties["cm:versionLabel"]> + <#if node.hasAspect("cm:versionable")><#local version = node.properties["cm:versionLabel"]!""> <#if item.createdBy??> <#local createdBy = item.createdBy.displayName> <#local createdByUser = item.createdBy.userName> diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/move.post.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/move.post.json.ftl index f84196703e..ff80f35c67 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/move.post.json.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/move.post.json.ftl @@ -3,7 +3,7 @@ <#if result.error?exists> "error" : "${result.error}" <#else> - "name" : "${result.name}" + "title" : "${result.title}" } diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.get.json.ftl index fe2748e3e6..2c1c91cc56 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.get.json.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.get.json.ftl @@ -27,6 +27,7 @@ <#list node.versionHistory as record> { "name": "${record.name}", + "title": "${record.title}", "version": "${record.versionLabel}", "versionId": "${record.id}", "date": "<@dateFormat record.createdDate />", 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 73fda8f906..4514fdfec3 100644 --- a/source/java/org/alfresco/repo/web/scripts/calendar/AbstractCalendarWebScript.java +++ b/source/java/org/alfresco/repo/web/scripts/calendar/AbstractCalendarWebScript.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Alfresco Software Limited. + * Copyright (C) 2005-2012 Alfresco Software Limited. * * This file is part of Alfresco * @@ -34,7 +34,6 @@ import org.alfresco.repo.calendar.CalendarModel; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.service.cmr.activities.ActivityService; import org.alfresco.service.cmr.calendar.CalendarEntry; -import org.alfresco.service.cmr.calendar.CalendarEntryDTO; import org.alfresco.service.cmr.calendar.CalendarService; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; @@ -67,6 +66,8 @@ import org.springframework.extensions.webscripts.json.JSONWriter; */ public abstract class AbstractCalendarWebScript extends DeclarativeWebScript { + private static final DateTimeFormatter ALL_DAY_DATETIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd'T00:00:00.000'"); + public static final String CALENDAR_SERVICE_ACTIVITY_APP_NAME = "calendar"; protected static final String MSG_EVENT_NOT_FOUND = "calendar.err.event.not.found"; @@ -503,43 +504,35 @@ public abstract class AbstractCalendarWebScript extends DeclarativeWebScript /** - * Remove the time zone for a given date if the - * Calendar Entry is an all day event + * Removes the time zone for a given date if the Calendar Entry is an all day event + * * @return ISO 8601 formatted date String */ - protected String removeTimeZoneIfIsAllDay(Date date, Boolean isAllDay){ - return removeTimeZoneIfIsAllDay(date, isAllDay, null); + protected String removeTimeZoneIfRequired(Date date, Boolean isAllDay, Boolean removeTimezone) + { + return removeTimeZoneIfRequired(date, isAllDay, removeTimezone, null); } - - + /** - * Remove the time zone for a given date if the - * Calendar Entry is an all day event + * Removes the time zone for a given date if the Calendar Entry is an all day event + * * @return ISO 8601 formatted date String if datePattern is null */ - protected String removeTimeZoneIfIsAllDay(Date date, Boolean isAllDay, String datePattern){ - - DateTime dt; - if(isAllDay){ - dt= new DateTime(date, DateTimeZone.UTC); - }else{ - dt = new DateTime(date); - } - DateTimeFormatter fmt; - if(datePattern==null){ - if(isAllDay){ - fmt = DateTimeFormat.forPattern("yyyy-MM-dd'T00:00:00.000'"); - }else{ - fmt = ISODateTimeFormat.dateTime(); - } - - }else{ - //For Legacy Dates and Times. - fmt = DateTimeFormat.forPattern(datePattern); - } - return dt.toString(fmt); + protected String removeTimeZoneIfRequired(Date date, Boolean isAllDay, Boolean removeTimezone, String datePattern) + { + DateTime dateTime = (removeTimezone) ? (new DateTime(date, DateTimeZone.UTC)) : (new DateTime(date)); + + if (null == datePattern) + { + return dateTime.toString((isAllDay) ? (ALL_DAY_DATETIME_FORMATTER) : (ISODateTimeFormat.dateTime())); + } + else + { + // For Legacy Dates and Times. + return dateTime.toString(DateTimeFormat.forPattern(datePattern)); + } } - + protected abstract Map executeImpl(SiteInfo site, String eventName, WebScriptRequest req, JSONObject json, Status status, Cache cache); diff --git a/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntriesListGet.java b/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntriesListGet.java index 2f35cde67c..e189c526e1 100644 --- a/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntriesListGet.java +++ b/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntriesListGet.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Alfresco Software Limited. + * Copyright (C) 2005-2012 Alfresco Software Limited. * * This file is part of Alfresco * @@ -89,15 +89,16 @@ public class CalendarEntriesListGet extends AbstractCalendarListingWebScript result.put(RESULT_NAME, entry.getSystemName()); result.put(RESULT_TITLE, entry.getTitle()); boolean isAllDay = CalendarEntryDTO.isAllDay(entry); - result.put(RESULT_START, removeTimeZoneIfIsAllDay(entry.getStart(),isAllDay)); - result.put(RESULT_END, removeTimeZoneIfIsAllDay(entry.getEnd(),isAllDay)); + boolean removeTimezone = isAllDay && !entry.isOutlook(); + result.put(RESULT_START, removeTimeZoneIfRequired(entry.getStart(), isAllDay, removeTimezone)); + result.put(RESULT_END, removeTimeZoneIfRequired(entry.getEnd(), isAllDay, removeTimezone)); String legacyDateFormat = "M/d/yyyy"; String legacyTimeFormat ="HH:mm"; - result.put("legacyDateFrom", removeTimeZoneIfIsAllDay(entry.getStart(), isAllDay, legacyDateFormat)); - result.put("legacyTimeFrom", removeTimeZoneIfIsAllDay(entry.getStart(), isAllDay, legacyTimeFormat)); - result.put("legacyDateTo", removeTimeZoneIfIsAllDay(entry.getEnd(), isAllDay, legacyDateFormat)); - result.put("legacyTimeTo", removeTimeZoneIfIsAllDay(entry.getEnd(), isAllDay, legacyTimeFormat)); + result.put("legacyDateFrom", removeTimeZoneIfRequired(entry.getStart(), isAllDay, removeTimezone, legacyDateFormat)); + result.put("legacyTimeFrom", removeTimeZoneIfRequired(entry.getStart(), isAllDay, removeTimezone, legacyTimeFormat)); + result.put("legacyDateTo", removeTimeZoneIfRequired(entry.getEnd(), isAllDay, removeTimezone, legacyDateFormat)); + result.put("legacyTimeTo", removeTimeZoneIfRequired(entry.getEnd(), isAllDay, removeTimezone, legacyTimeFormat)); result.put("fromDate", entry.getStart()); diff --git a/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryGet.java b/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryGet.java index c327e75e1c..e14ee207a5 100644 --- a/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryGet.java +++ b/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryGet.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Alfresco Software Limited. + * Copyright (C) 2005-2012 Alfresco Software Limited. * * This file is part of Alfresco * @@ -74,15 +74,16 @@ public class CalendarEntryGet extends AbstractCalendarWebScript result.put("description", entry.getDescription()); result.put("location", entry.getLocation()); boolean isAllDay = CalendarEntryDTO.isAllDay(entry); - result.put("from", removeTimeZoneIfIsAllDay(entry.getStart(),isAllDay)); - result.put("to", removeTimeZoneIfIsAllDay(entry.getEnd(),isAllDay)); + boolean removeTimezone = isAllDay && !entry.isOutlook(); + result.put("from", removeTimeZoneIfRequired(entry.getStart(), isAllDay, removeTimezone)); + result.put("to", removeTimeZoneIfRequired(entry.getEnd(), isAllDay, removeTimezone)); String legacyDateFormat = "M/d/yyyy"; String legacyTimeFormat ="HH:mm"; - result.put("legacyDateFrom", removeTimeZoneIfIsAllDay(entry.getStart(), isAllDay, legacyDateFormat)); - result.put("legacyTimeFrom", removeTimeZoneIfIsAllDay(entry.getStart(), isAllDay, legacyTimeFormat)); - result.put("legacyDateTo", removeTimeZoneIfIsAllDay(entry.getEnd(), isAllDay, legacyDateFormat)); - result.put("legacyTimeTo", removeTimeZoneIfIsAllDay(entry.getEnd(), isAllDay, legacyTimeFormat)); + result.put("legacyDateFrom", removeTimeZoneIfRequired(entry.getStart(), isAllDay, removeTimezone, legacyDateFormat)); + result.put("legacyTimeFrom", removeTimeZoneIfRequired(entry.getStart(), isAllDay, removeTimezone, legacyTimeFormat)); + result.put("legacyDateTo", removeTimeZoneIfRequired(entry.getEnd(), isAllDay, removeTimezone, legacyDateFormat)); + result.put("legacyTimeTo", removeTimeZoneIfRequired(entry.getEnd(), isAllDay, removeTimezone, legacyTimeFormat)); result.put("tags", entry.getTags()); result.put("isoutlook", entry.isOutlook()); diff --git a/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryPost.java b/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryPost.java index 4de9d255f5..bc5bea34fa 100644 --- a/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryPost.java +++ b/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryPost.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Alfresco Software Limited. + * Copyright (C) 2005-2012 Alfresco Software Limited. * * This file is part of Alfresco * @@ -19,7 +19,6 @@ package org.alfresco.repo.web.scripts.calendar; import java.text.MessageFormat; -import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; import java.util.ResourceBundle; @@ -93,15 +92,15 @@ public class CalendarEntryPost extends AbstractCalendarWebScript result.put("desc", entry.getDescription()); result.put("where", entry.getLocation()); - result.put("from", removeTimeZoneIfIsAllDay(entry.getStart(),isAllDay)); - result.put("to", removeTimeZoneIfIsAllDay(entry.getEnd(),isAllDay)); + result.put("from", removeTimeZoneIfRequired(entry.getStart(), isAllDay, isAllDay)); + result.put("to", removeTimeZoneIfRequired(entry.getEnd(), isAllDay, isAllDay)); String legacyDateFormat = "yyyy-MM-dd"; String legacyTimeFormat ="HH:mm"; - result.put("legacyDateFrom", removeTimeZoneIfIsAllDay(entry.getStart(), isAllDay, legacyDateFormat)); - result.put("legacyTimeFrom", removeTimeZoneIfIsAllDay(entry.getStart(), isAllDay, legacyTimeFormat)); - result.put("legacyDateTo", removeTimeZoneIfIsAllDay(entry.getEnd(), isAllDay, legacyDateFormat)); - result.put("legacyTimeTo", removeTimeZoneIfIsAllDay(entry.getEnd(), isAllDay, legacyTimeFormat)); + result.put("legacyDateFrom", removeTimeZoneIfRequired(entry.getStart(), isAllDay, isAllDay, legacyDateFormat)); + result.put("legacyTimeFrom", removeTimeZoneIfRequired(entry.getStart(), isAllDay, isAllDay, legacyTimeFormat)); + result.put("legacyDateTo", removeTimeZoneIfRequired(entry.getEnd(), isAllDay, isAllDay, legacyDateFormat)); + result.put("legacyTimeTo", removeTimeZoneIfRequired(entry.getEnd(), isAllDay, isAllDay, legacyTimeFormat)); result.put("uri", "calendar/event/" + site.getShortName() + "/" + entry.getSystemName() + dateOpt); diff --git a/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryPut.java b/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryPut.java index a52a0bb81a..eb99d7004b 100644 --- a/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryPut.java +++ b/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryPut.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Alfresco Software Limited. + * Copyright (C) 2005-2012 Alfresco Software Limited. * * This file is part of Alfresco * @@ -159,15 +159,16 @@ public class CalendarEntryPut extends AbstractCalendarWebScript result.put("summary", entry.getTitle()); result.put("description", entry.getDescription()); result.put("location", entry.getLocation()); - result.put("dtstart", removeTimeZoneIfIsAllDay(entry.getStart(),isAllDay)); - result.put("dtend", removeTimeZoneIfIsAllDay(entry.getEnd(),isAllDay)); + boolean removeTimezone = isAllDay && !entry.isOutlook(); + result.put("dtstart", removeTimeZoneIfRequired(entry.getStart(), isAllDay, removeTimezone)); + result.put("dtend", removeTimeZoneIfRequired(entry.getEnd(), isAllDay, removeTimezone)); String legacyDateFormat = "yyyy-MM-dd"; String legacyTimeFormat ="HH:mm"; - result.put("legacyDateFrom", removeTimeZoneIfIsAllDay(entry.getStart(), isAllDay, legacyDateFormat)); - result.put("legacyTimeFrom", removeTimeZoneIfIsAllDay(entry.getStart(), isAllDay, legacyTimeFormat)); - result.put("legacyDateTo", removeTimeZoneIfIsAllDay(entry.getEnd(), isAllDay, legacyDateFormat)); - result.put("legacyTimeTo", removeTimeZoneIfIsAllDay(entry.getEnd(), isAllDay, legacyTimeFormat)); + result.put("legacyDateFrom", removeTimeZoneIfRequired(entry.getStart(), isAllDay, removeTimezone, legacyDateFormat)); + result.put("legacyTimeFrom", removeTimeZoneIfRequired(entry.getStart(), isAllDay, removeTimezone, legacyTimeFormat)); + result.put("legacyDateTo", removeTimeZoneIfRequired(entry.getEnd(), isAllDay, removeTimezone, legacyDateFormat)); + result.put("legacyTimeTo", removeTimeZoneIfRequired(entry.getEnd(), isAllDay, removeTimezone, legacyTimeFormat)); result.put("uri", "calendar/event/" + site.getShortName() + "/" + entry.getSystemName() + dateOpt); diff --git a/source/java/org/alfresco/repo/web/scripts/calendar/UserCalendarEntriesGet.java b/source/java/org/alfresco/repo/web/scripts/calendar/UserCalendarEntriesGet.java index 0d52c33193..cb24a95ef8 100644 --- a/source/java/org/alfresco/repo/web/scripts/calendar/UserCalendarEntriesGet.java +++ b/source/java/org/alfresco/repo/web/scripts/calendar/UserCalendarEntriesGet.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Alfresco Software Limited. + * Copyright (C) 2005-2012 Alfresco Software Limited. * * This file is part of Alfresco * @@ -18,7 +18,6 @@ */ package org.alfresco.repo.web.scripts.calendar; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collections; import java.util.Date; @@ -160,20 +159,21 @@ public class UserCalendarEntriesGet extends AbstractCalendarListingWebScript // Build the object Map result = new HashMap(); boolean isAllDay = CalendarEntryDTO.isAllDay(entry); + boolean removeTimezone = isAllDay && !entry.isOutlook(); result.put(RESULT_EVENT, entry); result.put(RESULT_NAME, entry.getSystemName()); result.put(RESULT_TITLE, entry.getTitle()); result.put("description", entry.getDescription()); result.put("where", entry.getLocation()); - result.put(RESULT_START, removeTimeZoneIfIsAllDay(entry.getStart(),isAllDay)); - result.put(RESULT_END, removeTimeZoneIfIsAllDay(entry.getEnd(),isAllDay)); + result.put(RESULT_START, removeTimeZoneIfRequired(entry.getStart(), isAllDay, removeTimezone)); + result.put(RESULT_END, removeTimeZoneIfRequired(entry.getEnd(), isAllDay, removeTimezone)); String legacyDateFormat = "yyyy-MM-dd"; String legacyTimeFormat ="HH:mm"; - result.put("legacyDateFrom", removeTimeZoneIfIsAllDay(entry.getStart(), isAllDay, legacyDateFormat)); - result.put("legacyTimeFrom", removeTimeZoneIfIsAllDay(entry.getStart(), isAllDay, legacyTimeFormat)); - result.put("legacyDateTo", removeTimeZoneIfIsAllDay(entry.getEnd(), isAllDay, legacyDateFormat)); - result.put("legacyTimeTo", removeTimeZoneIfIsAllDay(entry.getEnd(), isAllDay, legacyTimeFormat)); + result.put("legacyDateFrom", removeTimeZoneIfRequired(entry.getStart(), isAllDay, removeTimezone, legacyDateFormat)); + result.put("legacyTimeFrom", removeTimeZoneIfRequired(entry.getStart(), isAllDay, removeTimezone, legacyTimeFormat)); + result.put("legacyDateTo", removeTimeZoneIfRequired(entry.getEnd(), isAllDay, removeTimezone, legacyDateFormat)); + result.put("legacyTimeTo", removeTimeZoneIfRequired(entry.getEnd(), isAllDay, removeTimezone, legacyTimeFormat)); diff --git a/source/java/org/alfresco/repo/web/scripts/solr/NodesMetaDataGet.java b/source/java/org/alfresco/repo/web/scripts/solr/NodesMetaDataGet.java index 162a4006f9..bf65b846c1 100644 --- a/source/java/org/alfresco/repo/web/scripts/solr/NodesMetaDataGet.java +++ b/source/java/org/alfresco/repo/web/scripts/solr/NodesMetaDataGet.java @@ -195,7 +195,7 @@ public class NodesMetaDataGet extends DeclarativeWebScript } catch(Exception e) { - throw new AlfrescoRuntimeException("Problem converting to Freemarker", e); + throw new AlfrescoRuntimeException("Problem converting to Freemarker using node " + nodeMetaData.getNodeRef().toString(), e); } if(noSizeCalculated && --counter == 0) diff --git a/source/java/org/alfresco/repo/web/scripts/wiki/AbstractWikiWebScript.java b/source/java/org/alfresco/repo/web/scripts/wiki/AbstractWikiWebScript.java index 96ebad322e..1218604240 100644 --- a/source/java/org/alfresco/repo/web/scripts/wiki/AbstractWikiWebScript.java +++ b/source/java/org/alfresco/repo/web/scripts/wiki/AbstractWikiWebScript.java @@ -141,7 +141,7 @@ public abstract class AbstractWikiWebScript extends DeclarativeWebScript JSONWriter activity = new JSONWriter(activityJson); activity.startObject(); activity.writeValue("title", wikiPage.getTitle()); - activity.writeValue("page", page + "?title=" + URLEncoder.encodeUriComponent(wikiPage.getSystemName())); + activity.writeValue("page", page + "?title=" + URLEncoder.encodeUriComponent(wikiPage.getTitle())); activity.endObject(); activityService.postActivity( @@ -282,15 +282,13 @@ public abstract class AbstractWikiWebScript extends DeclarativeWebScript throw new WebScriptException(Status.STATUS_NOT_FOUND, error); } - // Page name is optional - // Note - it's really the Name, even if it's called "Title" - String pageName = templateVars.get("pageTitle"); + String pageTitle = templateVars.get("pageTitle"); // Have the real work done - return executeImpl(site, pageName, req, json, status, cache); + return executeImpl(site, pageTitle, req, json, status, cache); } protected abstract Map executeImpl(SiteInfo site, - String pageName, WebScriptRequest req, JSONObject json, + String pageTitle, WebScriptRequest req, JSONObject json, Status status, Cache cache); } diff --git a/source/java/org/alfresco/repo/web/scripts/wiki/WikiPageDelete.java b/source/java/org/alfresco/repo/web/scripts/wiki/WikiPageDelete.java index c4d7147b43..f524fc43bc 100644 --- a/source/java/org/alfresco/repo/web/scripts/wiki/WikiPageDelete.java +++ b/source/java/org/alfresco/repo/web/scripts/wiki/WikiPageDelete.java @@ -38,13 +38,13 @@ import org.springframework.extensions.webscripts.WebScriptRequest; public class WikiPageDelete extends AbstractWikiWebScript { @Override - protected Map executeImpl(SiteInfo site, String pageName, + protected Map executeImpl(SiteInfo site, String pageTitle, WebScriptRequest req, JSONObject json, Status status, Cache cache) { Map model = new HashMap(); // Try to find the page - WikiPageInfo page = wikiService.getWikiPage(site.getShortName(), pageName); + WikiPageInfo page = wikiService.getWikiPage(site.getShortName(), pageTitle); if (page == null) { String message = "The Wiki Page could not be found"; diff --git a/source/java/org/alfresco/repo/web/scripts/wiki/WikiPageGet.java b/source/java/org/alfresco/repo/web/scripts/wiki/WikiPageGet.java index d6446f96b9..58d638b137 100644 --- a/source/java/org/alfresco/repo/web/scripts/wiki/WikiPageGet.java +++ b/source/java/org/alfresco/repo/web/scripts/wiki/WikiPageGet.java @@ -51,14 +51,14 @@ public class WikiPageGet extends AbstractWikiWebScript private static final Pattern LINK_PATTERN = Pattern.compile("\\[\\[([^\\|\\]]+)"); @Override - protected Map executeImpl(SiteInfo site, String pageName, + protected Map executeImpl(SiteInfo site, String pageTitle, WebScriptRequest req, JSONObject json, Status status, Cache cache) { final ResourceBundle rb = getResources(); Map model = new HashMap(); // Try to find the page - WikiPageInfo page = wikiService.getWikiPage(site.getShortName(), pageName); + WikiPageInfo page = wikiService.getWikiPage(site.getShortName(), pageTitle); if (page == null) { String message = "The Wiki Page could not be found"; @@ -106,10 +106,10 @@ public class WikiPageGet extends AbstractWikiWebScript PagingRequest paging = new PagingRequest(MAX_QUERY_ENTRY_COUNT); PagingResults pages = wikiService.listWikiPages(site.getShortName(), paging); - List pageNames = new ArrayList(); + List pageTitles = new ArrayList(); for (WikiPageInfo p : pages.getPage()) { - pageNames.add(p.getSystemName()); + pageTitles.add(p.getTitle()); } @@ -118,7 +118,7 @@ public class WikiPageGet extends AbstractWikiWebScript model.put("node", page.getNodeRef()); model.put("container", page.getContainerNodeRef()); model.put("links", links); - model.put("pageList", pageNames); + model.put("pageList", pageTitles); model.put("tags", page.getTags()); model.put("siteId", site.getShortName()); model.put("site", site); diff --git a/source/java/org/alfresco/repo/web/scripts/wiki/WikiPageListGet.java b/source/java/org/alfresco/repo/web/scripts/wiki/WikiPageListGet.java index ec944eaaed..6ffd82ea56 100644 --- a/source/java/org/alfresco/repo/web/scripts/wiki/WikiPageListGet.java +++ b/source/java/org/alfresco/repo/web/scripts/wiki/WikiPageListGet.java @@ -59,7 +59,7 @@ public class WikiPageListGet extends AbstractWikiWebScript } @Override - protected Map executeImpl(SiteInfo site, String pageName, + protected Map executeImpl(SiteInfo site, String pageTitle, WebScriptRequest req, JSONObject json, Status status, Cache cache) { // Decide on what kind of request they wanted diff --git a/source/java/org/alfresco/repo/web/scripts/wiki/WikiPageMovePost.java b/source/java/org/alfresco/repo/web/scripts/wiki/WikiPageMovePost.java index 6e165a4e5b..f59449e955 100644 --- a/source/java/org/alfresco/repo/web/scripts/wiki/WikiPageMovePost.java +++ b/source/java/org/alfresco/repo/web/scripts/wiki/WikiPageMovePost.java @@ -47,14 +47,14 @@ public class WikiPageMovePost extends AbstractWikiWebScript private static final String MSG_NOT_FOUND= "page-not-found"; @Override - protected Map executeImpl(SiteInfo site, String pageName, + protected Map executeImpl(SiteInfo site, String pageTitle, WebScriptRequest req, JSONObject json, Status status, Cache cache) { final Map model = new HashMap(); final ResourceBundle rb = getResources(); // Try to find the page we're renaming - WikiPageInfo page = wikiService.getWikiPage(site.getShortName(), pageName); + WikiPageInfo page = wikiService.getWikiPage(site.getShortName(), pageTitle); if (page == null) { String message = "The Wiki Page could not be found"; @@ -88,7 +88,7 @@ public class WikiPageMovePost extends AbstractWikiWebScript // Create the "This page has been moved" entry for the old page - String movedContent = rb.getString(MSG_MOVED) + " [[" + page.getSystemName() + + String movedContent = rb.getString(MSG_MOVED) + " [[" + page.getTitle() + "|" + rb.getString(MSG_MOVED_HERE) + "]]."; wikiService.createWikiPage(site.getShortName(), oldTitle, movedContent); @@ -99,6 +99,7 @@ public class WikiPageMovePost extends AbstractWikiWebScript // All done model.put("name", page.getSystemName()); + model.put("title", page.getTitle()); model.put("page", page); model.put("siteId", site.getShortName()); model.put("site", site); diff --git a/source/java/org/alfresco/repo/web/scripts/wiki/WikiPagePut.java b/source/java/org/alfresco/repo/web/scripts/wiki/WikiPagePut.java index 7b4f62fddb..99f94cad88 100644 --- a/source/java/org/alfresco/repo/web/scripts/wiki/WikiPagePut.java +++ b/source/java/org/alfresco/repo/web/scripts/wiki/WikiPagePut.java @@ -54,7 +54,7 @@ public class WikiPagePut extends AbstractWikiWebScript } @Override - protected Map executeImpl(SiteInfo site, String pageName, + protected Map executeImpl(SiteInfo site, String pageTitle, WebScriptRequest req, JSONObject json, Status status, Cache cache) { Map model = new HashMap(); @@ -71,7 +71,7 @@ public class WikiPagePut extends AbstractWikiWebScript } else { - title = pageName; + title = pageTitle; } // Fetch the versioning details @@ -103,7 +103,7 @@ public class WikiPagePut extends AbstractWikiWebScript } // Are we creating or editing? - WikiPageInfo page = wikiService.getWikiPage(site.getShortName(), pageName); + WikiPageInfo page = wikiService.getWikiPage(site.getShortName(), pageTitle); if (page == null) { // Create the page diff --git a/source/java/org/alfresco/repo/web/scripts/wiki/WikiPageVersionGet.java b/source/java/org/alfresco/repo/web/scripts/wiki/WikiPageVersionGet.java index d66a028dce..756b6f1956 100644 --- a/source/java/org/alfresco/repo/web/scripts/wiki/WikiPageVersionGet.java +++ b/source/java/org/alfresco/repo/web/scripts/wiki/WikiPageVersionGet.java @@ -66,7 +66,7 @@ public class WikiPageVersionGet extends AbstractWikiWebScript } @Override - protected Map executeImpl(SiteInfo site, String pageName, + protected Map executeImpl(SiteInfo site, String pageTitle, WebScriptRequest req, JSONObject json, Status status, Cache cache) { Map model = new HashMap(); @@ -81,7 +81,7 @@ public class WikiPageVersionGet extends AbstractWikiWebScript } // Try to find the page - WikiPageInfo page = wikiService.getWikiPage(site.getShortName(), pageName); + WikiPageInfo page = wikiService.getWikiPage(site.getShortName(), pageTitle); if (page == null) { String message = "The Wiki Page could not be found";