From cf7f623db5e01ddd53e150c1dd2f861041c85f0f Mon Sep 17 00:00:00 2001 From: Erik Winlof Date: Thu, 4 Sep 2014 06:27:52 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 81869: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 81096: Merged DEV to V4.2-BUG-FIX (4.2.4) 76610: MNT-11444: Locally set permissions on moderated public sites lead to unexpected results - Set siteId to the location to avoid redirection for a user, who is not a member of a site, but has access to a document. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83195 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../slingshot/documentlibrary-v2/parse-args.lib.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/parse-args.lib.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/parse-args.lib.js index ba40332782..18bd451892 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/parse-args.lib.js +++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/parse-args.lib.js @@ -93,6 +93,7 @@ var Common = try { var location = null, + siteId = null, qnamePaths, displayPaths; @@ -125,8 +126,8 @@ var Common = } else if ((qnamePaths.length > 4) && (qnamePaths[2] == TYPE_SITES)) { - var siteId = displayPaths[3], - siteNode = Common.getSite(siteId), + siteId = displayPaths[3]; + var siteNode = Common.getSite(siteId), containerId = qnamePaths[4].substr(3); if (siteNode != null) @@ -154,7 +155,7 @@ var Common = { location = { - site: null, + site: siteId, container: null, path: "/" + displayPaths.slice(2, displayPaths.length).join("/"), file: node.name