inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release/V2.4.0.x into merge/MNT-17512_AuditManagePermissions.

Browse Source
This commit is contained in:
Tom Page
2017-02-24 10:19:44 +00:00
parent 78ac6f5261 d338fe3fe0
commit c3aaa264f0
5 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service.properties
View File

@@ -15,6 +15,6 @@ rm.audit.audit-view=Audit View
rm.audit.trail-file-fail=Can't generate audit report.
rm.audit.audit-report=Audit Report
rm.audit.set-permission=Set Permission
rm.audit.enable-inherit-permission=Enable Inherit Permissions
rm.audit.disable-inherit-permission=Disable Inherit Permissions
rm.audit.enable-inherit-permission=Inherited Permissions Switched On
rm.audit.disable-inherit-permission=Inherited Permissions Switched Off
recordable-version-config=Auto-Declare Options

1
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
View File

@@ -967,6 +967,7 @@
<![CDATA[
org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.registerAuditEvent=RM_ALLOW
org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.auditEvent=RM_ALLOW
org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.auditOrUpdateEvent=RM_ALLOW
org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.clearAuditLog=RM_CAP.0.rma:filePlanComponent.DeleteAudit
org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.getAuditTrail=RM_ALLOW
org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.getAuditTrailFile=RM_ALLOW

3
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditService.java
View File

@@ -46,8 +46,6 @@ public interface RecordsManagementAuditService extends RecordsManagementAuditSer
{
public enum ReportFormat { HTML, JSON }
/**
* Retrieves a list of audit events.
*
@@ -165,7 +163,6 @@ public interface RecordsManagementAuditService extends RecordsManagementAuditSer
*/
void stopAuditLog(NodeRef filePlan);
/**
* Clears the RM audit.
*

6
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
View File

@@ -577,22 +577,20 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean
*
* @param nodeRef The node the event is against.
* @param eventName The name of the event.
* @param auditDetails The complete set of events for the transaction.
* @return The pre-existing event node, or null if none exists.
*/
private RMAuditNode findExistingEventNode(NodeRef nodeRef, String eventName)
{
AlfrescoTransactionSupport.bindListener(txnListener);
Set<RMAuditNode> auditDetails = TransactionalResourceHelper.getSet(KEY_RM_AUDIT_NODE_RECORDS);
RMAuditNode existingEventNode = null;
for (RMAuditNode existingRMAuditNode : auditDetails)
{
if (existingRMAuditNode.getNodeRef().equals(nodeRef) && existingRMAuditNode.getEventName().equals(eventName))
{
existingEventNode = existingRMAuditNode;
return existingRMAuditNode;
}
}
return existingEventNode;
return null;
}
/**

2
rm-community/rm-community-repo/source/java/org/alfresco/repo/security/permissions/impl/ExtendedPermissionServiceImpl.java
View File

@@ -248,7 +248,7 @@ public class ExtendedPermissionServiceImpl extends PermissionServiceImpl
{
// post process permission
result = postProcessor.process(result, nodeRef, perm, this.configuredReadPermissions, this.configuredFilePermissions);
}
}
return result;
}