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

Merged V3.1 to HEAD

Browse Source 
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
This commit is contained in:
Kevin Roast
2009-06-05 16:29:50 +00:00
parent 902252cde4
commit 6f60cfc4e0
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/templates/webscripts/org/alfresco/repository/version/version.get.js
View File

@@ -1,7 +1,5 @@
function main() function main()
{ {
var json = ""; var json = "";
var versions = []; var versions = [];

14
config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/doclist.get.js
View File

@@ -39,19 +39,9 @@ function getDocList(filter)
var typeQuery = getTypeFilterQuery(url.templateArgs.type); var typeQuery = getTypeFilterQuery(url.templateArgs.type);
query += " " + typeQuery; query += " " + typeQuery;
// Sort the list before trimming to page chunks // Query and sort the list before trimming to page chunks below
allAssets = search.luceneSearch(query, filterParams.sortBy, filterParams.sortByAscending); 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 // Ensure folders and folderlinks appear at the top of the list
folderAssets = new Array(); folderAssets = new Array();
documentAssets = new Array(); documentAssets = new Array();