From ab4d089f72c27db30d3eeda490e04d65e69c6501 Mon Sep 17 00:00:00 2001 From: Mike Hatfield Date: Thu, 31 Jul 2008 10:39:12 +0000 Subject: [PATCH] Multi-file actions no longer cause the DocLib to refresh multiple times git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10169 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../slingshot/documentlibrary/action/action.lib.ftl | 2 ++ .../slingshot/documentlibrary/action/action.lib.js | 5 +++++ .../slingshot/documentlibrary/action/copy-to.post.js | 11 +++++++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/action.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/action.lib.ftl index 2c46c2ff5d..6a9b47f79a 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/action.lib.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/action.lib.ftl @@ -3,6 +3,8 @@ { "totalResults": ${results?size}, "overallSuccess": ${overallSuccess?string}, + "successCount": ${successCount}, + "failureCount": ${failureCount}, "results": [ <#list results as r> diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/action.lib.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/action.lib.js index ceff7a25f3..f6a369004b 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/action.lib.js +++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/action.lib.js @@ -103,11 +103,16 @@ function main() * set of operations as failed. */ var overallSuccess = true; + var successCount = 0; + var failureCount = 0; for (var i = 0, j = results.length; i < j; i++) { overallSuccess = overallSuccess && results[i].success; + results[i].success ? ++successCount : ++failureCount; } model.overallSuccess = overallSuccess; + model.successCount = successCount; + model.failureCount = failureCount; model.results = results; } } diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/copy-to.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/copy-to.post.js index a1937dfd7a..f9f8735e4a 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/copy-to.post.js +++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/copy-to.post.js @@ -58,8 +58,15 @@ function runAction(p_params) { result.id = fileNode.name; result.type = fileNode.isContainer ? "folder" : "document"; - // copy the node (deep copy) - result.nodeRef = fileNode.copy(destNode, true); + // copy the node (deep copy for containers) + if (fileNode.isContainer) + { + result.nodeRef = fileNode.copy(destNode, true); + } + else + { + result.nodeRef = fileNode.copy(destNode); + } result.success = (result.nodeRef !== null); } }