Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

102708: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      102489: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         102284: Merged DEV to V4.2-BUG-FIX
            101812 : MNT-13710 : User cannot change site role if its current role contains an underscore
               - Added new unit test. Corrected some code.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103538 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-05-02 07:17:53 +00:00
parent 6a93e35eb0
commit 7078474695
3 changed files with 66 additions and 1 deletions

View File

@@ -2239,7 +2239,7 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
List<String> groups = getPermissionGroups(shortName, authorityName);
for (String group : groups)
{
int index = group.lastIndexOf('_');
int index = group.indexOf(shortName) + shortName.length();
if (index != -1)
{
result.add(group.substring(index + 1));