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 (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
63080: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62921: Merged DEV to V4.2-BUG-FIX (4.2.2)
         62833: ALF-20448: Public API Activities : activityType org.alfresco.site.user-joined doesn't contain siteId
          - Modify ActivitiesImpl.getSiteId() method to handle situation when default tenant domain is used. 
          - Add unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64263 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-03-14 15:45:02 +00:00
parent d6fb189489
commit e288cc2112
2 changed files with 81 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/rest/api/impl/ActivitiesImpl.java
View File

@@ -108,7 +108,7 @@ public class ActivitiesImpl implements Activities
private String getSiteId(String siteNetwork)
{
String siteId = null;
String siteId = siteNetwork;
int idx = siteNetwork.lastIndexOf(TenantService.SEPARATOR);
if(idx != -1)