From edf2c25c420327f5f6ebdf59f4c899a662993226 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Thu, 3 Nov 2016 20:06:29 +0000
Subject: [PATCH] Merged 5.2.N (5.2.1) to HEAD (5.2)    132249 rmunteanu:
 REPO-1523: REGRESS: Site created from API cannot be accessed via Share

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132361 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/java/org/alfresco/rest/api/impl/SitesImpl.java |  2 +-
 .../alfresco/rest/api/sites/SiteEntityResource.java   |  4 ++++
 .../org/alfresco/rest/api/tests/TestSites.java        | 11 +++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/source/java/org/alfresco/rest/api/impl/SitesImpl.java b/source/java/org/alfresco/rest/api/impl/SitesImpl.java
index d7486fec56..183ba8fc35 100644
--- a/source/java/org/alfresco/rest/api/impl/SitesImpl.java
+++ b/source/java/org/alfresco/rest/api/impl/SitesImpl.java
@@ -1102,7 +1102,7 @@ public class SitesImpl implements Sites
         SiteInfo siteInfo = null;
         try
         {
-            siteInfo = siteService.createSite(site.getPreset(), site.getId(), site.getTitle(), site.getDescription(), site.getVisibility());
+            siteInfo = siteService.createSite(site.getPreset() != null ? site.getPreset() : "sitePreset", site.getId(), site.getTitle(), site.getDescription(), site.getVisibility());
         }
         catch (SiteServiceException sse)
         {
diff --git a/source/java/org/alfresco/rest/api/sites/SiteEntityResource.java b/source/java/org/alfresco/rest/api/sites/SiteEntityResource.java
index 6e58b06826..ea82313d64 100644
--- a/source/java/org/alfresco/rest/api/sites/SiteEntityResource.java
+++ b/source/java/org/alfresco/rest/api/sites/SiteEntityResource.java
@@ -150,6 +150,10 @@ public class SiteEntityResource implements EntityResourceAction.Read<Site>,
         {
             throw new InvalidArgumentException("Site update does not support field: role");
         }
+        if (site.getPreset() != null)
+        {
+            throw new InvalidArgumentException("Site update does not support field: preset");
+        }
 
         // Bind valid fields to a SiteUpdate instance.
         final String title = site.getTitle();
diff --git a/source/test-java/org/alfresco/rest/api/tests/TestSites.java b/source/test-java/org/alfresco/rest/api/tests/TestSites.java
index a0444637a6..09269c1b43 100644
--- a/source/test-java/org/alfresco/rest/api/tests/TestSites.java
+++ b/source/test-java/org/alfresco/rest/api/tests/TestSites.java
@@ -706,6 +706,17 @@ public class TestSites extends EnterpriseTestApi
                     null,
                     "Expected 400 response when updating "+site.getSiteId(), 400);
 
+            sitesProxy.update(
+                    "sites",
+                    site.getSiteId(),
+                    null,
+                    null,
+                    "{\n" +
+                            "  \"preset\": \"sitePreset\"" +
+                            "}",
+                    null,
+                    "Expected 400 response when updating "+site.getSiteId(), 400);
+
             // Details should not have changed.
             Site fresh = sitesProxy.getSite(site.getSiteId(), 200);
             site.expected(fresh);