diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml
index 91f28fe81d..62883b7f5c 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml
@@ -33,6 +33,7 @@
RM Site
st:site
+ false
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
index 7741c02f69..e9089b1541 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
@@ -88,6 +88,7 @@
+
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java
index 3b700d4da2..e87b851f9e 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java
@@ -38,6 +38,7 @@ import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteVisibility;
@@ -74,6 +75,9 @@ public class RmSiteType extends BaseBehaviourBean
/** Capability service */
protected CapabilityService capabilityService;
+ /** Authority service */
+ private AuthorityService authorityService;
+
/** Map of file plan type's key'ed by corresponding site types */
protected Map mapFilePlanType = new HashMap(3);
@@ -102,6 +106,14 @@ public class RmSiteType extends BaseBehaviourBean
this.capabilityService = capabilityService;
}
+ /**
+ * @param authorityService authority service
+ */
+ public void setAuthorityService(AuthorityService authorityService)
+ {
+ this.authorityService = authorityService;
+ }
+
/**
* Registers a file plan type for a specific site type.
*
@@ -256,6 +268,10 @@ public class RmSiteType extends BaseBehaviourBean
{
throw new AlfrescoRuntimeException("The records management site can not be deleted, because the user doesn't have sufficient privillages to delete the file plan.");
}
+
+ // delete the authority
+ String siteGroup = siteService.getSiteGroup(siteInfo.getShortName());
+ authorityService.deleteAuthority(siteGroup, true);
}
}
}