Merged modules/recordsmanagement/BRANCHES/V2.0-BUG-FIX to modules/recordsmanagement/BRANCHES/V2.0

42539: RM-506 (RM Console - Audit - Some Audit Events are displayed incorrectly.)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.0@42567 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2012-10-12 10:16:01 +00:00
parent 5cb2fb1f51
commit db77c51196
2 changed files with 9 additions and 1 deletions

View File

@@ -31,4 +31,6 @@ rm.audit.pdf-record=Set Record As PDF A Record
rm.audit.photo-record=Set Record As A Digital Photographic Record rm.audit.photo-record=Set Record As A Digital Photographic Record
rm.audit.web-record=Set Record As A Web Record rm.audit.web-record=Set Record As A Web Record
rm.audit.trail-file-fail=Failed to generate audit trail file. rm.audit.trail-file-fail=Failed to generate audit trail file.
rm.audit.audit-report=Audit Report rm.audit.audit-report=Audit Report
rm.audit.create-disposition-schedule=Create Disposition Schedule
rm.audit.unfreeze=Unfreeze

View File

@@ -129,6 +129,8 @@ public class RecordsManagementAuditServiceImpl
private static final String MSG_WEB_RECORD = "rm.audit.web-record"; private static final String MSG_WEB_RECORD = "rm.audit.web-record";
private static final String MSG_TRAIL_FILE_FAIL = "rm.audit.trail-file-fail"; private static final String MSG_TRAIL_FILE_FAIL = "rm.audit.trail-file-fail";
private static final String MSG_AUDIT_REPORT = "rm.audit.audit-report"; private static final String MSG_AUDIT_REPORT = "rm.audit.audit-report";
private static final String MSG_CREATE_DISPOSITION_SCHEDULE = "rm.audit.create-disposition-schedule";
private static final String MSG_UNFREEZE = "rm.audit.unfreeze";
/** Logger */ /** Logger */
private static Log logger = LogFactory.getLog(RecordsManagementAuditServiceImpl.class); private static Log logger = LogFactory.getLog(RecordsManagementAuditServiceImpl.class);
@@ -320,6 +322,10 @@ public class RecordsManagementAuditServiceImpl
new AuditEvent("applyDigitalPhotographRecord", MSG_PHOTO_RECORD)); new AuditEvent("applyDigitalPhotographRecord", MSG_PHOTO_RECORD));
this.auditEvents.put("applyWebRecord", this.auditEvents.put("applyWebRecord",
new AuditEvent("applyWebRecord", MSG_WEB_RECORD)); new AuditEvent("applyWebRecord", MSG_WEB_RECORD));
this.auditEvents.put("createDispositionSchedule",
new AuditEvent("createDispositionSchedule", MSG_CREATE_DISPOSITION_SCHEDULE));
this.auditEvents.put("unfreeze",
new AuditEvent("unfreeze", MSG_UNFREEZE));
} }
@Override @Override