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 V3.1 to HEAD

Browse Source 
13084: Merged V2.1-A to V3.1
      7984: *RECORD-ONLY* Final part of fix for ACT 819, by default the web-client now generates WebScript content download API based URLs to allow relative paths to be resolved in HTML content files
   13086: Merged V2.1-A to V3.1
      7986: *RECORD-ONLY* Additional for ACT 819, View In Browser details page links and cm:link objects to content now output Content API webscript urls
   13090: Merged V2.1-A to V3.1
      7986: Language locale auto-selection based on browser locale - see ACT 1053
      NOTE: a web-client-config setting has been added to enable this - it is off by default.
   13093: Merged V2.1-A to V3.1
      8255: Filetypes and PanelGenerator enhancements
   13094: Merged V2.1-A to V3.1
      8547: Branding changes from Mike [just filetypes merged]
   13095: Merged V2.1-A to V3.1
      8555: Webdav path support for ExternalAccessServlet browse navigation
   13103: Merged V2.1-A to V3.1
      8592: Fix for login page issue with language locale auto-selection - see ACT 1053

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13559 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-03-11 11:16:01 +00:00
parent 3af6eec220
commit 57afebd2cd
26 changed files with 223 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java
View File

@@ -212,15 +212,23 @@ public class ExternalAccessServlet extends BaseServlet
}
else if (OUTCOME_BROWSE.equals(outcome))
{
if (args != null && args.length >= 3)
NodeRef nodeRef = null;
if (args.length != 0 && args[0].equals(WebDAVServlet.WEBDAV_PREFIX))
{
nodeRef = resolveWebDAVPath(fc, args);
}
else if (args.length >= 3)
{
NodeRef nodeRef = null;
int offset = 0;
offset = args.length - 3;
StoreRef storeRef = new StoreRef(args[0+offset], args[1+offset]);
nodeRef = new NodeRef(storeRef, args[2+offset]);
}
if (nodeRef != null)
{
// check that the user has at least READ access - else redirect to the login page
if (permissionService.hasPermission(nodeRef, PermissionService.READ) == AccessStatus.DENIED)
{