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 V3.2 to HEAD

Browse Source 
16700: Fix for ETHREEOH-2509 - Leaving a private site breaks All Sites search for any term found in documents user created in that site.
   16703: Fix for ETHREEOH-2775 - "Show all" fails for user if permissions of folder that item was deleted from are changed to exclude them.
   16705: Fixes to Site Links dashlet component.
   16707: Fixed ETHREEOH-619 "User who is already a member of the site (or invite is pending) can be added to the invite list"

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16899 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-10-14 09:55:04 +00:00
parent 85c1b71826
commit e2626e2cb3
1 changed files with 42 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -322,20 +322,13 @@ public class SiteServiceImpl implements SiteService, SiteModel
/** /**
* Check that the site does not already exist * Check that the site does not already exist
*/ */
AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>() // Check to see if we already have a site of this name
{ NodeRef existingSite = getSiteNodeRef(shortName);
public String doWork() throws Exception if (existingSite != null)
{ {
// Check to see if we already have a site of this name // Throw an exception since we have a duplicate site name
NodeRef existingSite = getSiteNodeRef(shortName); throw new SiteServiceException(MSG_UNABLE_TO_CREATE, new Object[]{shortName});
if (existingSite != null) }
{
// Throw an exception since we have a duplicate site name
throw new SiteServiceException(MSG_UNABLE_TO_CREATE, new Object[]{shortName});
}
return null;
}
}, AuthenticationUtil.getSystemUserName());
// Get the site parent node reference // Get the site parent node reference
NodeRef siteParent = getSiteParent(shortName); NodeRef siteParent = getSiteParent(shortName);
@@ -375,7 +368,6 @@ public class SiteServiceImpl implements SiteService, SiteModel
shareZones.add(AuthorityService.ZONE_APP_SHARE); shareZones.add(AuthorityService.ZONE_APP_SHARE);
shareZones.add(AuthorityService.ZONE_AUTH_ALFRESCO); shareZones.add(AuthorityService.ZONE_AUTH_ALFRESCO);
// Create the site's groups // Create the site's groups
String siteGroup = authorityService String siteGroup = authorityService
.createAuthority(AuthorityType.GROUP, getSiteGroup(shortName, false), shortName, shareZones); .createAuthority(AuthorityType.GROUP, getSiteGroup(shortName, false), shortName, shareZones);
@@ -513,7 +505,7 @@ public class SiteServiceImpl implements SiteService, SiteModel
} }
/** /**
* Gets a sites parent folder based on it's short name ] * Gets a sites parent folder based on it's short name
* *
* @param shortName site short name * @param shortName site short name
* @return NodeRef the site's parent * @return NodeRef the site's parent
@@ -739,19 +731,25 @@ public class SiteServiceImpl implements SiteService, SiteModel
*/ */
private SiteInfo createSiteInfo(NodeRef siteNodeRef) private SiteInfo createSiteInfo(NodeRef siteNodeRef)
{ {
// Get the properties SiteInfo siteInfo = null;
Map<QName, Serializable> properties = this.nodeService.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);
// Get the visibility of the site if (this.permissionService.hasPermission(siteNodeRef, PermissionService.READ_PROPERTIES).equals(AccessStatus.ALLOWED))
SiteVisibility visibility = getSiteVisibility(siteNodeRef); {
// Get the properties
Map<QName, Serializable> properties = this.nodeService.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);
// Get the visibility of the site
SiteVisibility visibility = getSiteVisibility(siteNodeRef);
// Create and return the site information
Map<QName, Serializable> customProperties = getSiteCustomProperties(properties);
siteInfo = new SiteInfoImpl(sitePreset, shortName, title, description, visibility, customProperties, siteNodeRef);
}
// Create and return the site information
Map<QName, Serializable> customProperties = getSiteCustomProperties(properties);
SiteInfo siteInfo = new SiteInfoImpl(sitePreset, shortName, title, description, visibility, customProperties, siteNodeRef);
return siteInfo; return siteInfo;
} }
@@ -843,7 +841,7 @@ public class SiteServiceImpl implements SiteService, SiteModel
* *
* @return NodeRef node reference * @return NodeRef node reference
*/ */
private NodeRef getSiteNodeRef(String shortName) private NodeRef getSiteNodeRef(final String shortName)
{ {
final String cacheKey = this.tenantAdminService.getCurrentUserDomain() + '_' + shortName; final String cacheKey = this.tenantAdminService.getCurrentUserDomain() + '_' + shortName;
NodeRef siteNodeRef = this.siteNodeRefs.get(cacheKey); NodeRef siteNodeRef = this.siteNodeRefs.get(cacheKey);
@@ -859,16 +857,23 @@ public class SiteServiceImpl implements SiteService, SiteModel
else else
{ {
// not in cache - find and store // not in cache - find and store
NodeRef siteRoot = getSiteParent(shortName); final NodeRef siteRoot = getSiteParent(shortName);
// the site "short name" directly maps to the cm:name property siteNodeRef = AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<NodeRef>()
siteNodeRef = this.nodeService.getChildByName(siteRoot, ContentModel.ASSOC_CONTAINS, shortName);
// cache the result if found - null results will be requeried to ensure new sites are found later
if (siteNodeRef != null)
{ {
this.siteNodeRefs.put(cacheKey, siteNodeRef); public NodeRef doWork() throws Exception
} {
// the site "short name" directly maps to the cm:name property
NodeRef siteNodeRef = nodeService.getChildByName(siteRoot, ContentModel.ASSOC_CONTAINS, shortName);
// cache the result if found - null results will be required to ensure new sites are found later
if (siteNodeRef != null)
{
siteNodeRefs.put(cacheKey, siteNodeRef);
}
return siteNodeRef;
}
}, AuthenticationUtil.getSystemUserName());
} }
return siteNodeRef; return siteNodeRef;
} }