From c0245b05df95b42ced13d492c009f150b1263448 Mon Sep 17 00:00:00 2001 From: Roy Wetherall Date: Thu, 12 Sep 2013 05:06:40 +0000 Subject: [PATCH] RM-951: FilePlan is not refreshed automatically after creating a category RM-950: Completed Records are not displayed for RM Admin RM-949: RM admin can see only own Categories/Folders/Records git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@55257 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../slingshot/documentlibrary-v2/rm-doclist.lib.js | 11 +++++------ .../slingshot/documentlibrary-v2/rm-filters.lib.js | 3 ++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-doclist.lib.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-doclist.lib.js index ef4a61e1d1..717667fcfb 100644 --- a/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-doclist.lib.js +++ b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-doclist.lib.js @@ -28,12 +28,11 @@ function doclist_getAllNodes(parsedArgs, filterParams, query, totalItemCount) requestTotalCountMax = 0, paged = false, allNodes = []; - if (query == "" && - ( - (filter || "path") == "path" || - (filter || "unfiledRecords") == "unfiledRecords" || - (filter || "holds") == "holds" || - (filter || "transfers") == "transfers")) + if ((filter || "path") == "path" || + query == "" && + ((filter || "unfiledRecords") == "unfiledRecords" || + (filter || "holds") == "holds" || + (filter || "transfers") == "transfers")) { // TODO also add DB filter by "node" (in addition to "path") var parentNode = parsedArgs.pathNode; diff --git a/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-filters.lib.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-filters.lib.js index d9a34d830a..5742afcc41 100644 --- a/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-filters.lib.js +++ b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/rm-filters.lib.js @@ -174,7 +174,8 @@ Filters.getFilterParams = function RecordsManagementFilter_getFilterParams(filte break; case "unfiledRecords": - + + filterParams.query = ""; break; default: