From 6f60cfc4e09719e205a519887bea39d24faf2f57 Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Fri, 5 Jun 2009 16:29:50 +0000 Subject: [PATCH] Merged V3.1 to HEAD 14465: Fix for ALFCOM-195 - date added to WCM FreeMarker template model. 14466: Fix for ETHREEOH-2075 14469: Fix for ETHREEOH-2120 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repository/version/version.get.js | 2 -- .../slingshot/documentlibrary/doclist.get.js | 14 ++------------ 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/version/version.get.js b/config/alfresco/templates/webscripts/org/alfresco/repository/version/version.get.js index 730d16d143..d343704ff0 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/version/version.get.js +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/version/version.get.js @@ -1,7 +1,5 @@ - function main() { - var json = ""; var versions = []; diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/doclist.get.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/doclist.get.js index 7a13ced4e7..3905583735 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/doclist.get.js +++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/doclist.get.js @@ -39,19 +39,9 @@ function getDocList(filter) var typeQuery = getTypeFilterQuery(url.templateArgs.type); query += " " + typeQuery; - // Sort the list before trimming to page chunks - allAssets = search.luceneSearch(query, filterParams.sortBy, filterParams.sortByAscending); + // Query and sort the list before trimming to page chunks below + allAssets = search.luceneSearch(query, filterParams.sortBy, filterParams.sortByAscending, filterParams.limitResults ? filterParams.limitResults : 0); - // Limit the resultset? - if (filterParams.limitResults) - { - /** - * This isn't a true results trim (page-trimming is done below), as we haven't yet filtered by type. - * However, it's useful for a quick slimming-down of the "recently..." queries. - */ - allAssets = allAssets.slice(0, filterParams.limitResults); - } - // Ensure folders and folderlinks appear at the top of the list folderAssets = new Array(); documentAssets = new Array();