mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V3.2E to HEAD
17385: Minor performance tweaks and code cleanup/consolidation in SiteServiceImpl. 17386: ETHREEOH-3066 Added supporting logging 17387: Minor javadoc updates pertinent to the FreeMarker API chapter updates. 17392: Fix to unreported issue in User Profile where a recent fix incorrectly encoding javascript values as ?html. - values passed into JS components in FreeMarker template should use ?js_string operator - not the ?html operator. 17399: ETHREEOH-3269, ETHREEOH-3271 - Dropdown markup changed for keyboard access 17400: ETHREEOH-3278 - Navigator is very wide 17401: Concatenate DocLib JavaScript files git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18120 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -207,7 +207,6 @@ public class People extends BaseTemplateProcessorExtension implements Initializi
|
||||
* Gets the members (people) of a group (including all sub-groups)
|
||||
*
|
||||
* @param group the group to retrieve members for
|
||||
* @param recurse recurse into sub-groups
|
||||
*
|
||||
* @return list of nodes representing the group members
|
||||
*/
|
||||
@@ -236,7 +235,7 @@ public class People extends BaseTemplateProcessorExtension implements Initializi
|
||||
*
|
||||
* @param person the user (cm:person) to get the containing groups for
|
||||
*
|
||||
* @return the containing groups as a JavaScript array, can be null
|
||||
* @return the containing groups as a List of TemplateNode objects, can be null
|
||||
*/
|
||||
public List<TemplateNode> getContainerGroups(TemplateNode person)
|
||||
{
|
||||
@@ -272,11 +271,11 @@ public class People extends BaseTemplateProcessorExtension implements Initializi
|
||||
}
|
||||
|
||||
/**
|
||||
* Return true if the specified user is an Administrator authority.
|
||||
* Return true if the specified user is an Guest authority.
|
||||
*
|
||||
* @param person to test
|
||||
*
|
||||
* @return true if an admin, false otherwise
|
||||
* @return true if a guest user, false otherwise
|
||||
*/
|
||||
public boolean isGuest(TemplateNode person)
|
||||
{
|
||||
@@ -287,8 +286,7 @@ public class People extends BaseTemplateProcessorExtension implements Initializi
|
||||
/**
|
||||
* Gets a map of capabilities (boolean assertions) for the given person.
|
||||
*
|
||||
* @param person
|
||||
* the person
|
||||
* @param person the person
|
||||
* @return the capability map
|
||||
*/
|
||||
public Map<String, Boolean> getCapabilities(final TemplateNode person)
|
||||
|
Reference in New Issue
Block a user