mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Latest updates for the MediaWiki/Share integration
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12120 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -259,10 +259,32 @@ public class SiteServiceImpl implements SiteService, SiteModel
|
||||
}, AuthenticationUtil.getSystemUserName());
|
||||
|
||||
// Return created site information
|
||||
SiteInfo siteInfo = new SiteInfo(sitePreset, shortName, title, description, isPublic, siteNodeRef);
|
||||
Map<QName, Serializable> customProperties = getSiteCustomProperties(siteNodeRef);
|
||||
SiteInfo siteInfo = new SiteInfo(sitePreset, shortName, title, description, isPublic, customProperties, siteNodeRef);
|
||||
return siteInfo;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets a map containing the site's custom properties
|
||||
*
|
||||
* @return Map<QName, Serializable> map containing the custom properties of the site
|
||||
*/
|
||||
private Map<QName, Serializable> getSiteCustomProperties(NodeRef siteNodeRef)
|
||||
{
|
||||
Map<QName, Serializable> customProperties = new HashMap<QName, Serializable>(5);
|
||||
Map<QName, Serializable> properties = nodeService.getProperties(siteNodeRef);
|
||||
|
||||
for (Map.Entry<QName, Serializable> entry : properties.entrySet())
|
||||
{
|
||||
if (entry.getKey().getNamespaceURI().equals(SITE_CUSTOM_PROPERTY_URL) == true)
|
||||
{
|
||||
customProperties.put(entry.getKey(), entry.getValue());
|
||||
}
|
||||
}
|
||||
|
||||
return customProperties;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.alfresco.repo.site.SiteService#getSiteGroup(java.lang.String)
|
||||
*/
|
||||
@@ -409,7 +431,8 @@ public class SiteServiceImpl implements SiteService, SiteModel
|
||||
boolean isPublic = isSitePublic(siteNodeRef);
|
||||
|
||||
// Create and return the site information
|
||||
SiteInfo siteInfo = new SiteInfo(sitePreset, shortName, title, description, isPublic, siteNodeRef);
|
||||
Map<QName, Serializable> customProperties = getSiteCustomProperties(siteNodeRef);
|
||||
SiteInfo siteInfo = new SiteInfo(sitePreset, shortName, title, description, isPublic, customProperties, siteNodeRef);
|
||||
return siteInfo;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user