Fixed build failure and updated invite content users to request content permissions

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2116 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2006-01-16 17:02:12 +00:00
parent 907f2a6ed1
commit c1470bc5ed
2 changed files with 13 additions and 8 deletions

View File

@@ -228,38 +228,43 @@
<!-- Permissions specific to content --> <!-- Permissions specific to content -->
<!-- =============================== --> <!-- =============================== -->
<permissionSet type="cm:content" expose="all"> <permissionSet type="cm:content" expose="selected">
<!-- Extend some base permission groups to include permissoins related to content. --> <!-- Extend some base permission groups to include permissoins related to content. -->
<permissionGroup name="Read" extends="true" expose="true"/> <permissionGroup name="Read" extends="true" expose="false"/>
<permissionGroup name="Write" extends="true" expose="true"/> <permissionGroup name="Write" extends="true" expose="false"/>
<!-- Add an execute permission group. --> <!-- Add an execute permission group. -->
<permissionGroup name="Execute" allowFullControl="false" expose="true"/> <permissionGroup name="Execute" allowFullControl="false" expose="false"/>
<!-- Content specific low-level permissions. --> <!-- Content specific low-level permissions. -->
<!-- The permission to read content. --> <!-- The permission to read content. -->
<permission name="ReadContent" expose="true"> <permission name="ReadContent" expose="false">
<grantedToGroup permissionGroup="Read"/> <grantedToGroup permissionGroup="Read"/>
<requiredPermission on="parent" name="ReadChildren" implies="false"/> <requiredPermission on="parent" name="ReadChildren" implies="false"/>
</permission> </permission>
<!-- The permission to write content. --> <!-- The permission to write content. -->
<permission name="WriteContent" expose="true"> <permission name="WriteContent" expose="false">
<grantedToGroup permissionGroup="Write" /> <grantedToGroup permissionGroup="Write" />
<requiredPermission on="parent" name="ReadChildren" implies="false"/> <requiredPermission on="parent" name="ReadChildren" implies="false"/>
</permission> </permission>
<!-- Execute permission on content. --> <!-- Execute permission on content. -->
<permission name="ExecuteContent" expose="true"> <permission name="ExecuteContent" expose="false">
<grantedToGroup permissionGroup="Execute" /> <grantedToGroup permissionGroup="Execute" />
<requiredPermission on="parent" name="ReadChildren" implies="false"/> <requiredPermission on="parent" name="ReadChildren" implies="false"/>
</permission> </permission>
<permissionGroup name="Coordinator" extends="true" expose="true"/>
<permissionGroup name="Contributor" extends="true" expose="true"/>
<permissionGroup name="Editor" extends="true" expose="true"/>
<permissionGroup name="Guest" extends="true" expose="true"/>
</permissionSet> </permissionSet>
<!-- ============================================== --> <!-- ============================================== -->

View File

@@ -308,7 +308,7 @@ public class PermissionServiceTest extends AbstractPermissionTest
assertEquals(0, answer.size()); assertEquals(0, answer.size());
answer = permissionService.getSettablePermissions(QName.createQName("cm", "content", namespacePrefixResolver)); answer = permissionService.getSettablePermissions(QName.createQName("cm", "content", namespacePrefixResolver));
assertEquals(21, answer.size()); assertEquals(4, answer.size());
answer = permissionService.getSettablePermissions(QName.createQName("cm", "folder", namespacePrefixResolver)); answer = permissionService.getSettablePermissions(QName.createQName("cm", "folder", namespacePrefixResolver));
assertEquals(4, answer.size()); assertEquals(4, answer.size());