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

ALFCOM-2981 Cannot find moderated site if I am a 'non-owner' using search field

Browse Source 
- Moderated sites now have CONSUMER role for everyone.
 - Note that I havn't fixed the permissions of existing Moderates Sites,  This will only work for new and updated sites.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14793 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2009-06-18 16:13:08 +00:00
parent e4efa5265c
commit 31c439521f
3 changed files with 154 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -396,7 +396,8 @@ public class SiteServiceImpl implements SiteService, SiteModel
}
else if (SiteVisibility.MODERATED.equals(visibility) == true)
{
permissionService.setPermission(siteNodeRef, PermissionService.ALL_AUTHORITIES, PermissionService.READ_PROPERTIES, true);
permissionService.setPermission(siteNodeRef, PermissionService.ALL_AUTHORITIES, SITE_CONSUMER, true);
//permissionService.setPermission(siteNodeRef, PermissionService.ALL_AUTHORITIES, PermissionService.READ_PROPERTIES, true);
}
permissionService.setPermission(siteNodeRef,
PermissionService.ALL_AUTHORITIES,
@@ -589,7 +590,7 @@ public class SiteServiceImpl implements SiteService, SiteModel
{
String escNameFilter = LuceneQueryParser.escape(nameFilter.replace('"', ' '));
// Perform a Lucene search under the Site parent node using *name*, title and description search query
QueryParameterDefinition[] params = new QueryParameterDefinition[3];
final QueryParameterDefinition[] params = new QueryParameterDefinition[3];
params[0] = new QueryParameterDefImpl(
ContentModel.PROP_NAME,
dictionaryService.getDataType(
@@ -621,7 +622,8 @@ public class SiteServiceImpl implements SiteService, SiteModel
siteRoot.getStoreRef(),
SearchService.LANGUAGE_LUCENE,
query.toString(),
params);
params);
result = new ArrayList<SiteInfo>(results.length());
try
{
@@ -895,7 +897,8 @@ public class SiteServiceImpl implements SiteService, SiteModel
}
else if (SiteVisibility.MODERATED.equals(currentVisibility) == true)
{
this.permissionService.deletePermission(siteNodeRef, PermissionService.ALL_AUTHORITIES, PermissionService.READ_PROPERTIES);
this.permissionService.deletePermission(siteNodeRef, PermissionService.ALL_AUTHORITIES, SITE_CONSUMER);
//this.permissionService.deletePermission(siteNodeRef, PermissionService.ALL_AUTHORITIES, PermissionService.READ_PROPERTIES);
// TODO update all child folders ?? ...
}
@@ -906,7 +909,8 @@ public class SiteServiceImpl implements SiteService, SiteModel
}
else if (SiteVisibility.MODERATED.equals(updatedVisibility) == true)
{
this.permissionService.setPermission(siteNodeRef, PermissionService.ALL_AUTHORITIES, PermissionService.READ_PROPERTIES, true);
this.permissionService.setPermission(siteNodeRef, PermissionService.ALL_AUTHORITIES, SITE_CONSUMER, true);
//this.permissionService.setPermission(siteNodeRef, PermissionService.ALL_AUTHORITIES, PermissionService.READ_PROPERTIES, true);
// TODO update all child folders ?? ...
}