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;