mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-08 14:51:49 +00:00
Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
105785: Work around for ACE-3943: SiteService assumes java.lang.String for cm:title and cm:description git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105944 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -93,7 +93,6 @@ import org.alfresco.service.cmr.search.SearchService;
|
||||
import org.alfresco.service.cmr.security.AccessPermission;
|
||||
import org.alfresco.service.cmr.security.AccessStatus;
|
||||
import org.alfresco.service.cmr.security.AuthorityService;
|
||||
import org.alfresco.service.cmr.security.AuthorityService.AuthorityFilter;
|
||||
import org.alfresco.service.cmr.security.AuthorityType;
|
||||
import org.alfresco.service.cmr.security.NoSuchPersonException;
|
||||
import org.alfresco.service.cmr.security.PermissionService;
|
||||
@@ -1234,8 +1233,8 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
|
||||
Map<QName, Serializable> properties = this.directNodeService.getProperties(siteNodeRef);
|
||||
String shortName = (String) properties.get(ContentModel.PROP_NAME);
|
||||
String sitePreset = (String) properties.get(PROP_SITE_PRESET);
|
||||
String title = (String) properties.get(ContentModel.PROP_TITLE);
|
||||
String description = (String) properties.get(ContentModel.PROP_DESCRIPTION);
|
||||
String title = DefaultTypeConverter.INSTANCE.convert(String.class, properties.get(ContentModel.PROP_TITLE));
|
||||
String description = DefaultTypeConverter.INSTANCE.convert(String.class, properties.get(ContentModel.PROP_DESCRIPTION));
|
||||
|
||||
// Get the visibility of the site
|
||||
SiteVisibility visibility = getSiteVisibility(siteNodeRef);
|
||||
@@ -1784,6 +1783,9 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
|
||||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
// TODO: Should error but do not want to break anything here, so will fall through (DH)
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user