From 2da18b50138dac34ec243f1f0b1e98d4561a0a8f Mon Sep 17 00:00:00 2001 From: Mike Hatfield Date: Wed, 21 Apr 2010 21:52:29 +0000 Subject: [PATCH] Fix unreported issue with dynamic tree nodes and lost "hidden folders" info tip in Share DocLib. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19943 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../slingshot/documentlibrary/doclist.get.js | 13 +++++++++++-- .../slingshot/documentlibrary/filters.lib.js | 5 +++-- 2 files changed, 14 insertions(+), 4 deletions(-) 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 fcc83f2dab..33ab6e58b5 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 @@ -71,8 +71,17 @@ function getDoclist() // Node type counts var folderNodesCount = folderNodes.length, documentNodesCount = documentNodes.length, - nodes = folderNodes.concat(documentNodes), - totalRecords = nodes.length; + nodes, totalRecords; + + if (parsedArgs.type === "documents") + { + nodes = documentNodes; + } + else + { + nodes = folderNodes.concat(documentNodes); + } + totalRecords = nodes.length; // Pagination var pageSize = args.size || nodes.length, diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/filters.lib.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/filters.lib.js index 0540f2e76d..5b75e0a591 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/filters.lib.js +++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/filters.lib.js @@ -1,11 +1,12 @@ var Filters = { /** - * Type map to filter required types + * Type map to filter required types. + * NOTE: "documents" filter also returns folders to show UI hint about hidden folders. */ TYPE_MAP: { - "documents": '+(TYPE:"{http://www.alfresco.org/model/content/1.0}content" OR TYPE:"{http://www.alfresco.org/model/application/1.0}filelink")', + "documents": '+(TYPE:"{http://www.alfresco.org/model/content/1.0}content" OR TYPE:"{http://www.alfresco.org/model/application/1.0}filelink" OR TYPE:"{http://www.alfresco.org/model/content/1.0}folder")', "folders": '+(TYPE:"{http://www.alfresco.org/model/content/1.0}folder" OR TYPE:"{http://www.alfresco.org/model/application/1.0}folderlink")', "images": "-TYPE:\"{http://www.alfresco.org/model/content/1.0}thumbnail\" +@cm\\:content.mimetype:image/*" },