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

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
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
This commit is contained in:
Erik Winlof
2014-09-04 06:27:52 +00:00
parent 22be126dec
commit cf7f623db5
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/parse-args.lib.js
View File

@@ -93,6 +93,7 @@ var Common =
try try
{ {
var location = null, var location = null,
siteId = null,
qnamePaths, qnamePaths,
displayPaths; displayPaths;
@@ -125,8 +126,8 @@ var Common =
} }
else if ((qnamePaths.length > 4) && (qnamePaths[2] == TYPE_SITES)) else if ((qnamePaths.length > 4) && (qnamePaths[2] == TYPE_SITES))
{ {
var siteId = displayPaths[3], siteId = displayPaths[3];
siteNode = Common.getSite(siteId), var siteNode = Common.getSite(siteId),
containerId = qnamePaths[4].substr(3); containerId = qnamePaths[4].substr(3);
if (siteNode != null) if (siteNode != null)
@@ -154,7 +155,7 @@ var Common =
{ {
location = location =
{ {
site: null, site: siteId,
container: null, container: null,
path: "/" + displayPaths.slice(2, displayPaths.length).join("/"), path: "/" + displayPaths.slice(2, displayPaths.length).join("/"),
file: node.name file: node.name