inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
82339: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75270: Added event generation for site creation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83204 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-04 06:30:54 +00:00
parent 7f3dda5c98
commit 214e1ea9d8
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/java/org/alfresco/repo/site/SiteServiceImpl.java
View File

@@ -1510,7 +1510,10 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
*/
public void updateSite(SiteInfo siteInfo)
{
String shortName = siteInfo.getShortName();
final String shortName = siteInfo.getShortName();
final String title = siteInfo.getTitle();
final String description = siteInfo.getDescription();
NodeRef siteNodeRef = getSiteNodeRef(shortName);
if (siteNodeRef == null)
{
@@ -1522,8 +1525,8 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
// Update the properties of the site
// Note: the site preset and short name should never be updated!
properties.put(ContentModel.PROP_TITLE, siteInfo.getTitle());
properties.put(ContentModel.PROP_DESCRIPTION, siteInfo.getDescription());
properties.put(ContentModel.PROP_TITLE, title);
properties.put(ContentModel.PROP_DESCRIPTION, description);
// Update the permissions based on the visibility
SiteVisibility currentVisibility = getSiteVisibility(siteNodeRef);
@@ -1598,6 +1601,18 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
// Set the updated properties back onto the site node reference
this.nodeService.setProperties(siteNodeRef, properties);
final SiteVisibility visibility = siteInfo.getVisibility();
final String sitePreset = siteInfo.getSitePreset();
eventPublisher.publishEvent(new EventPreparator(){
@Override
public Event prepareEvent(String user, String networkId, String transactionId)
{
return new SiteManagementEvent("site.update", transactionId, networkId, new Date().getTime(),
user, shortName,title,description, visibility.toString(),sitePreset);
}
});
}
/**