From 8d2bbb83c6da816ef1bbee6875782ca1ca357a9a Mon Sep 17 00:00:00 2001 From: Mike Hatfield Date: Thu, 16 Sep 2010 16:54:31 +0000 Subject: [PATCH] Merged from DEV/V3.3-DOCLIB-PORTLET to HEAD 22600: DocLib Portlet: New "Site constrained" portlet added where site is configured via portlet preferences. Removed CMIS portlet. Also added workflow and task pages to documentlibrary family git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22601 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../webscripts/org/alfresco/repository/site/sites.get.json.ftl | 2 +- .../org/alfresco/repository/site/sites.query.post.json.ftl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.get.json.ftl index 0748caf69e..1582104e77 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.get.json.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.get.json.ftl @@ -1,7 +1,7 @@ <#import "site.lib.ftl" as siteLib/> [ - <#list sites as site> + <#list sites?sort_by("shortName") as site> <@siteLib.siteJSON site=site/> <#if site_has_next>, diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.query.post.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.query.post.json.ftl index 0748caf69e..1582104e77 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.query.post.json.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.query.post.json.ftl @@ -1,7 +1,7 @@ <#import "site.lib.ftl" as siteLib/> [ - <#list sites as site> + <#list sites?sort_by("shortName") as site> <@siteLib.siteJSON site=site/> <#if site_has_next>,