inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.2.0 (5.2.0) to HEAD (5.2)

Browse Source 
133869 rmunteanu: REPO-1746: Merge fixes for 5.2 GA issues to 5.2.0 branch
      Merged 5.2.N (5.2.1) to 5.2.0 (5.2.0)
         133309 mward: Merged mward/5.2.n-repo1636-contentinfo (5.2.1) to 5.2.N (5.2.1)
            133294 mward: REPO-1636: Filter cm:preferenceValues and usr:enabled properties when getting people


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@134192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2017-01-11 10:35:36 +00:00
parent 31986ba6cb
commit b1c6752eff
2 changed files with 48 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/java/org/alfresco/rest/api/impl/PeopleImpl.java
View File

@@ -25,9 +25,6 @@
*/
package org.alfresco.rest.api.impl;
import java.io.Serializable;
import java.util.*;
import org.alfresco.model.ContentModel;
import org.alfresco.query.PagingRequest;
import org.alfresco.query.PagingResults;
@@ -64,6 +61,16 @@ import org.alfresco.service.cmr.usage.ContentUsageService;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.Pair;
import java.io.Serializable;
import java.util.AbstractList;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* Centralises access to people services and maps between representations.
*
@@ -97,7 +104,9 @@ public class PeopleImpl implements People
ContentModel.PROP_GOOGLEUSERNAME,
ContentModel.PROP_SIZE_QUOTA,
ContentModel.PROP_SIZE_CURRENT,
ContentModel.PROP_EMAIL_FEED_DISABLED);
ContentModel.PROP_EMAIL_FEED_DISABLED,
ContentModel.PROP_PREFERENCE_VALUES,
ContentModel.PROP_ENABLED);
protected Nodes nodes;
protected Sites sites;