inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged BRANCHES/DEV/V4.0-BUG-FIX to HEAD

Browse Source 
34666: Merged BRANCHES/V4.0 to BRANCHES/DEV/V4.0-BUG-FIX
      34664: Fix for ALF-13310 - Hidden renditions cause doclist error
      34665: Second part of fix for ALF-13310 (javascript api)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34696 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2012-03-22 14:58:30 +00:00
parent 84cfba1371
commit 728d0a5458
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/java/org/alfresco/repo/jscript/ScriptNode.java
View File

@@ -47,6 +47,7 @@ import org.alfresco.query.PagingRequest;
import org.alfresco.query.PagingResults;
import org.alfresco.repo.action.executer.TransformActionExecuter;
import org.alfresco.repo.content.transform.magick.ImageTransformationOptions;
import org.alfresco.repo.model.filefolder.FileFolderServiceImpl.InvalidTypeException;
import org.alfresco.repo.search.QueryParameterDefImpl;
import org.alfresco.repo.security.permissions.AccessDeniedException;
import org.alfresco.repo.tagging.script.TagScope;
@@ -96,11 +97,11 @@ import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.RegexQNamePattern;
import org.alfresco.util.FileFilterMode;
import org.alfresco.util.FileFilterMode.Client;
import org.alfresco.util.GUID;
import org.alfresco.util.ISO8601DateFormat;
import org.alfresco.util.ISO9075;
import org.alfresco.util.Pair;
import org.alfresco.util.FileFilterMode.Client;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.json.JSONException;
@@ -1301,6 +1302,7 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
*/
public String getWebdavUrl()
{
String url = "";
try
{
if (getIsContainer() || getIsDocument())
@@ -1317,15 +1319,18 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
path.append("/")
.append(URLEncoder.encode(paths.get(i).getName()));
}
return path.toString();
url = path.toString();
}
}
catch (InvalidTypeException typeErr)
{
// cannot build path if file is a type such as a rendition
}
catch (FileNotFoundException nodeErr)
{
// cannot build path if file no longer exists
return "";
}
return "";
return url;
}
/**