From 64c26a899f71d0c8c5c8027a75662bda0720095d Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Fri, 7 Mar 2008 12:40:18 +0000 Subject: [PATCH] Merged V2.2 to HEAD 8041: Merged V2.1 to V2.2 7736: Fix for broken "make versionable" action after webdav fixes 7755: Fix AR-1962: File is not truncated when opened for overwrite when using the older CIFS open file request 7971: Fix for AR-1964 (IE7 character encoding) 7973: Fixes transient submit failures when submitting deleted directories with no ancestors 7989: ACT-858: AVM Issuer 7994: WebDav document url now available in Template/Script APIs as per AR-1917 8002: AR-1978: Added support for SPNEGO to the CIFS passthru authenticator git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8462 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/web/bean/wcm/SubmitDialog.java | 2 +- source/web/scripts/ajax/myspaces.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java index bb9f1f3430..8c756cf168 100644 --- a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java @@ -714,7 +714,7 @@ public class SubmitDialog extends BaseDialogBean { // lookup the previous child and get its contents final List history = getAvmService().getHistory(desc, 2); - if (history.size() == 1) + if (history.size() <= 1) { return; } diff --git a/source/web/scripts/ajax/myspaces.js b/source/web/scripts/ajax/myspaces.js index f07336186c..37c51e6538 100644 --- a/source/web/scripts/ajax/myspaces.js +++ b/source/web/scripts/ajax/myspaces.js @@ -33,7 +33,7 @@ var MySpaces = { // is responsible for rendering just the contents of the main panel div YAHOO.util.Connect.asyncRequest( "GET", - MySpaces.ServiceContext + '/ui/myspacespanel?p='+MySpaces.Path+'&f='+MySpaces.Filter+'&h='+MySpaces.Home, + MySpaces.ServiceContext + '/ui/myspacespanel?p='+encodeURI(MySpaces.Path)+'&f='+MySpaces.Filter+'&h='+MySpaces.Home, { success: function(response) {