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 V4.1-BUG-FIX to HEAD

Browse Source 
38298: Fix for ALF-13737 - Error when 'favoriting' Company Home
   38303: Fix for ALF-10688 - Can't deactivate an account
   38307: ALF-14583: Latest Surf libs (r1092) to update .tld files to comply to strict DTD
   38314: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      38313: Merged V3.4 to V3.4-BUG-FIX
         38257: ALF-14646: Log rotation is broken in 3.4.10
         - Use a different log4j log file for each web application
         38266: ALF-14769: Deployment Installer: Title for 'Confirm password' field is absent on 'User Account Details' form
         - Specified a descriptionRetype prompt
         38306: ALF-13751: Missing change concerning preserving the AUTH.ALF zone on rezoned groups as well as persons


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@38316 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2012-06-25 16:50:41 +00:00
parent 2ed2de240a
commit ae56b07a6c
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/doclist.lib.js
View File

@@ -196,7 +196,7 @@ function doclist_main()
if (!locationNode.hasPermission("Read")) break;
location = Common.getLocation(locationNode, parsedArgs.libraryRoot);
// Parent node
if (node.parent != null && node.parent.hasPermission("Read"))
if (node.parent != null && node.parent.isContainer && node.parent.hasPermission("Read"))
{
item.parent = Evaluator.run(node.parent, true);
}

2
config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/filters.lib.js
View File

@@ -182,7 +182,7 @@ var Filters =
{
filterQuery = "+(" + filterQuery + ")";
// no need to specify path here for all sites - IDs are exact matches
if (parsedArgs.nodeRef != "alfresco://sites/home")
if (parsedArgs.nodeRef != "alfresco://sites/home" && parsedArgs.nodeRef != "alfresco://company/home")
{
filterQuery += ' +PATH:"' + parsedArgs.rootNode.qnamePath + '//cm:*"';
}

2
config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/doclist.get.js
View File

@@ -217,7 +217,7 @@ function getDoclist()
};
}
location.parent = {};
if (node.parent != null && node.parent.hasPermission("Read"))
if (node.parent != null && node.parent.isContainer && node.parent.hasPermission("Read"))
{
location.parent.nodeRef = String(node.parent.nodeRef.toString());
}

2
config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/filters.lib.js
View File

@@ -181,7 +181,7 @@ var Filters =
{
filterQuery = "+(" + filterQuery + ")";
// no need to specify path here for all sites - IDs are exact matches
if (parsedArgs.nodeRef != "alfresco://sites/home")
if (parsedArgs.nodeRef != "alfresco://sites/home" && parsedArgs.nodeRef != "alfresco://company/home")
{
filterQuery += ' +PATH:"' + parsedArgs.rootNode.qnamePath + '//cm:*"';
}