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 
133883 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)
         133721 mward: REPO-1636: fixed bug when updating person with aspects/props.
         See https://issues.alfresco.com/jira/browse/REPO-1636?focusedCommentId=495557&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-495557


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@134196 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2017-01-11 10:36:12 +00:00
parent fd6c9b565c
commit e5147104ad
2 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -583,6 +583,11 @@ public class PeopleImpl implements People
savePersonDescription(person.getDescription(), personNodeRef);
}
// Update custom aspects - do this *before* adding custom properties. The
// addition of custom properties may result in the auto-addition of aspects
// and we don't want to remove them during the update of explicitly specified aspects.
nodes.updateCustomAspects(personNodeRef, person.getAspectNames(), EXCLUDED_ASPECTS);
// Add custom properties
if (person.getProperties() != null)
{
@@ -601,9 +606,6 @@ public class PeopleImpl implements People
}
});
// Update custom aspects
nodes.updateCustomAspects(personNodeRef, person.getAspectNames(), EXCLUDED_ASPECTS);
return getPerson(personId);
}

44
source/test-java/org/alfresco/rest/api/tests/TestPeople.java
View File

@@ -751,6 +751,50 @@ public class TestPeople extends EnterpriseTestApi
assertNull(person.getProperties());
}
// Aspects and properties together
{
Person person = new Person();
String personId = UUID.randomUUID().toString()+"@"+account1.getId();
person.setUserName(personId);
person.setFirstName("Joe");
person.setEmail(personId);
person.setEnabled(true);
person.setPassword("password123");
// Start with no custom props/aspects
person.setProperties(null);
person.setAspectNames(null);
person = people.create(person);
assertNull(person.getAspectNames());
assertNull(person.getProperties());
// Auto-add the papi:comms aspect, by setting its papi:jabber property,
// but explicitly add the papi:lunchable aspect.
String json = qjson(
"{" +
" `aspectNames`: [ " +
" `papi:lunchable` " +
" ], " +
" `properties`: { " +
" `papi:jabber`: `another@jabber.example.com`, " +
" `papi:lunch`: `sandwich` " +
" }" +
"}"
);
person = people.update(person.getId(), json, 200);
// Were both aspects set?
List<String> aspectNames = person.getAspectNames();
assertEquals(2, aspectNames.size());
assertTrue(aspectNames.contains("papi:lunchable"));
assertTrue(aspectNames.contains("papi:comms"));
assertEquals(2, person.getProperties().size());
assertEquals("another@jabber.example.com", person.getProperties().get("papi:jabber"));
assertEquals("sandwich", person.getProperties().get("papi:lunch"));
}
// Remove a property by setting it to null
{
Person person = createTestUpdatePerson();