From 214e1ea9d8fdfd6072414a2d7ef9e2ef05abbf7e Mon Sep 17 00:00:00 2001 From: Erik Winlof Date: Thu, 4 Sep 2014 06:30:54 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 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 --- .../alfresco/repo/site/SiteServiceImpl.java | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/repo/site/SiteServiceImpl.java b/source/java/org/alfresco/repo/site/SiteServiceImpl.java index 481658e9ea..805562bb8b 100644 --- a/source/java/org/alfresco/repo/site/SiteServiceImpl.java +++ b/source/java/org/alfresco/repo/site/SiteServiceImpl.java @@ -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); + } + }); } /**