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 
133848 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)
         133297 jvonka: REPO-1646: V1 REST API - cannot unset optional fields (eg. when updating person / site details ...)
         - fix test fallout (Person returns empty Company object by default - as per existing V1 getPerson API)
         - TODO review the way we match expected results QueriesPeopleApiTest (vs other test patterns)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@134187 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2017-01-11 10:34:51 +00:00
parent a5dfaa0cdd
commit e743336a6e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/test-java/org/alfresco/rest/api/tests/client/data/Person.java
View File

@@ -136,7 +136,7 @@ public class Person
+ (enabled != null ? "enabled=" + enabled + ", " : "") + (enabled != null ? "enabled=" + enabled + ", " : "")
+ (firstName != null ? "firstName=" + firstName + ", " : "") + (firstName != null ? "firstName=" + firstName + ", " : "")
+ (lastName != null ? "lastName=" + lastName + ", " : "") + (lastName != null ? "lastName=" + lastName + ", " : "")
+ (company != null ? "company=" + company + ", " : "") + (company != null ? "company=" + company + ", " : "company=" + new Company().toString() + ", ")
+ (skypeId != null ? "skype=" + skypeId + ", " : "") + (skypeId != null ? "skype=" + skypeId + ", " : "")
+ (location != null ? "location=" + location + ", " : "") + (location != null ? "location=" + location + ", " : "")
+ (telephone != null ? "tel=" + telephone + ", " : "") + (telephone != null ? "tel=" + telephone + ", " : "")