From 164b43b9fd0bda7da672a693974f4b73d709239e Mon Sep 17 00:00:00 2001 From: Erik Winlof Date: Tue, 19 Aug 2008 16:58:28 +0000 Subject: [PATCH] First cut of the Uploader in pure html (non flash version). - Works in single upload and update mode (multi upload mode defaults to single upload) - Tested in doclib and works Stuff that needs fixing is: - Error handling from internal server errors - Make it work in profile page - Proper styling git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10427 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repository/upload/upload.get.html.400.ftl | 12 ++++++++++++ .../alfresco/repository/upload/upload.post.html.ftl | 8 ++++++-- .../org/alfresco/repository/upload/upload.post.js | 4 ++-- 3 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.get.html.400.ftl diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.get.html.400.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.get.html.400.ftl new file mode 100644 index 0000000000..6a9bf88ba1 --- /dev/null +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.get.html.400.ftl @@ -0,0 +1,12 @@ + + + Upload failure + + +<#if (args.failure?exists)> + + + + \ No newline at end of file diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.html.ftl index d3ff765ab0..ae6c0aaae5 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.html.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.html.ftl @@ -1,8 +1,12 @@ - File's Uploaded + Upload success -File's Uploaded +<#if (args.success?exists)> + + \ No newline at end of file diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.js index b4177cfe65..5aaf9fde94 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.js +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.js @@ -115,7 +115,7 @@ function main() status.redirect = true; } - if (updateNodeRef !== null && uploadDirectory === null) + if (updateNodeRef !== null && updateNodeRef != "" && (uploadDirectory === null || uploadDirectory == "")) { // Update existing file mode var workingCopy = search.findNode(updateNodeRef); @@ -160,7 +160,7 @@ function main() model.document = workingCopy; } - else if (uploadDirectory !== null && updateNodeRef === null) + else if (uploadDirectory !== null && (updateNodeRef === null || updateNodeRef == "")) { // Upload file mode var destNode = container;