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 HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
93992: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93945: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93895: MNT-12873: Merged V4.2.3 (4.2.3.16) to V4.2-BUG-FIX(4.2.5)
            93552 :Merged DEV to V4.2.3 (4.2.3.16)
               93524: MNT-13156: CLONE - Introduction of SiteRole in 4.2.x breaks sites API when there is a custom role defined
                  - Implement site role as String instead of enumeration to allow custom roles. Add CustomRoleTest Unit Test. In SitesImpl convert UnknownAuthorityException into InvalidArgumentException.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 15:29:20 +00:00
parent 35771b4879
commit f1ebfb963f
7 changed files with 187 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/java/org/alfresco/repo/site/SiteMembersCannedQuery.java
View File

@@ -36,7 +36,6 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteRole;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteService.SiteMembersCallback;
import org.alfresco.util.Pair;
@@ -113,7 +112,7 @@ public class SiteMembersCannedQuery extends AbstractCannedQuery<SiteMembership>
lastName = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_LASTNAME);
}
SiteMembership siteMember = new SiteMembership(siteInfo, authority, firstName, lastName, SiteRole.valueOf(permission));
SiteMembership siteMember = new SiteMembership(siteInfo, authority, firstName, lastName, permission);
siteMembers.add(siteMember);
}
@@ -229,8 +228,8 @@ public class SiteMembersCannedQuery extends AbstractCannedQuery<SiteMembership>
String firstName2 = o2.getFirstName();
String lastName1 = o1.getLastName();
String lastName2 = o2.getLastName();
SiteRole siteRole1 = o1.getRole();
SiteRole siteRole2 = o2.getRole();
String siteRole1 = o1.getRole();
String siteRole2 = o2.getRole();
int personId = safeCompare(personId1, personId2);
int firstName = safeCompare(firstName1, firstName2);

8
source/java/org/alfresco/repo/site/SiteMembership.java
View File

@@ -33,9 +33,9 @@ public class SiteMembership
private String personId;
private String firstName;
private String lastName;
private SiteRole role;
private String role;
public SiteMembership(SiteInfo siteInfo, String personId, String firstName, String lastName, SiteRole role)
public SiteMembership(SiteInfo siteInfo, String personId, String firstName, String lastName, String role)
{
super();
if(siteInfo == null)
@@ -65,7 +65,7 @@ public class SiteMembership
this.role = role;
}
public SiteMembership(SiteInfo siteInfo, String personId, SiteRole role)
public SiteMembership(SiteInfo siteInfo, String personId, String role)
{
super();
if(siteInfo == null)
@@ -106,7 +106,7 @@ public class SiteMembership
return lastName;
}
public SiteRole getRole()
public String getRole()
{
return role;
}

6
source/java/org/alfresco/repo/site/SitesCannedQuery.java
View File

@@ -108,7 +108,7 @@ public class SitesCannedQuery extends AbstractCannedQuery<SiteMembership>
String role = siteService.getMembersRole(siteName, userName);
if (role != null)
{
siteMembers.add(new SiteMembership(siteInfo, authority, SiteRole.valueOf(role)));
siteMembers.add(new SiteMembership(siteInfo, authority, role));
}
}
}
@@ -219,8 +219,8 @@ public class SitesCannedQuery extends AbstractCannedQuery<SiteMembership>
String firstName2 = o2.getFirstName();
String lastName1 = o1.getLastName();
String lastName2 = o2.getLastName();
SiteRole siteRole1 = o1.getRole();
SiteRole siteRole2 = o2.getRole();
String siteRole1 = o1.getRole();
String siteRole2 = o2.getRole();
String siteTitle1 = siteInfo1.getTitle();
String siteTitle2 = siteInfo2.getTitle();