inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V4.2-BUG-FIX (4.2.1) to HEAD (Cloud/4.3)

Browse Source 
56632: Merged V4.2.0 (4.2) to V4.2-BUG-FIX (4.2.1)
      56448: Fix for ALF-20266 - My Documents dashlet contains not only required documents but also wiki pages, blog posts, etc.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56650 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2013-10-14 17:31:31 +00:00
parent 2514f29673
commit 84ebbccb48
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@
<import resource="classpath:/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/parse-args.lib.js"> <import resource="classpath:/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/parse-args.lib.js">
const REQUEST_MAX = 1000; const REQUEST_MAX = 1000;
const SITES_SPACE_QNAME_PATH = "/app:company_home/st:sites/";
/** /**
* Main entry point: Create collection of documents and folders in the given space * Main entry point: Create collection of documents and folders in the given space
@@ -61,7 +62,7 @@ function getDoclist()
skip = (args.pos - 1) * max; skip = (args.pos - 1) * max;
} }
} }
var sortField = (args.sortField == null ? "cm:name" : args.sortField), var sortField = (args.sortField == null ? "cm:name" : args.sortField),
sortAsc = (((args.sortAsc == null) || (args.sortAsc == "true")) ? true : false); sortAsc = (((args.sortAsc == null) || (args.sortAsc == "true")) ? true : false);
@@ -97,21 +98,28 @@ function getDoclist()
} }
if (logger.isLoggingEnabled()) if (logger.isLoggingEnabled())
logger.log("doclist.get.js - query results: " + allNodes.length); logger.log("doclist.get.js - query results: " + allNodes.length);
// Generate the qname path match regex required for all sites 'documentLibrary' results match
var pathRegex; // TODO: replace with java.lang.String regex match for performance
var pathMatch;
if (allSites) if (allSites)
{ {
// escape the forward slash characters in the qname path // Generate a qname path match regex required for all sites 'documentLibrary' results match
// TODO: replace with java.lang.String regex match for performance pathMatch = new String(parsedArgs.rootNode.qnamePath).replace(/\//g, '\\/') + "\\/.*\\/cm:documentLibrary\\/.*";
var pathMatch = new String(parsedArgs.rootNode.qnamePath).replace(/\//g, '\\/') + "\\/.*\\/cm:documentLibrary\\/.*";
pathRegex = new RegExp(pathMatch, "gi");
if (logger.isLoggingEnabled()) if (logger.isLoggingEnabled())
logger.log("doclist.get.js - will match results using regex: " + pathMatch); logger.log("doclist.get.js - will match results using regex: " + pathMatch);
} }
else if (query)
{
// Generate a qname path match regex required for queries where entire repo has been searched - but don't want results
// from sites which are not documents - i.e. filter wiki, blog etc. from results
pathMatch = new String(SITES_SPACE_QNAME_PATH).replace(/\//g, '\\/') + ".*\\/cm:documentLibrary\\/.*";
}
var pathRegex = new RegExp(pathMatch, "gi");
// Ensure folders and folderlinks appear at the top of the list // Ensure folders and folderlinks appear at the top of the list
var folderNodes = [], var folderNodes = [],
documentNodes = []; documentNodes = [],
qnamepath;
for each (node in allNodes) for each (node in allNodes)
{ {
@@ -119,7 +127,8 @@ function getDoclist()
{ {
try try
{ {
if (!allSites || node.qnamePath.match(pathRegex)) var qnamePath = node.qnamePath;
if (!query || (allSites && qnamePath.match(pathRegex)) || qnamePath.indexOf(SITES_SPACE_QNAME_PATH) !== 0 || qnamePath.match(pathRegex))
{ {
totalItemCount--; totalItemCount--;
if (node.isContainer || node.isLinkToContainer) if (node.isContainer || node.isLinkToContainer)