Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -rd665bfd982e0a9e11818f0ed08c265d9c36adedb -r70cf04183bd09ee740203e876fd31a317badcbca Binary files differ Index: lams_common/conf/language/ApplicationResources.properties =================================================================== diff -u -rd665bfd982e0a9e11818f0ed08c265d9c36adedb -r70cf04183bd09ee740203e876fd31a317badcbca --- lams_common/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision d665bfd982e0a9e11818f0ed08c265d9c36adedb) +++ lams_common/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 70cf04183bd09ee740203e876fd31a317badcbca) @@ -33,4 +33,6 @@ # Audit entry made when a staff member changes a learner entry (in monitoring) audit.change.entry=Changed text for user {0}. Old text: {1} New Text: {2} # Audit entry made when a staff member hides a learner entry (in monitoring) -audit.hide.entry=Hide entry for user {0}. Entry was {1} \ No newline at end of file +audit.hide.entry=Hide entry for user {0}. Entry was {1} +# Audit entry made when a staff member shows a learner entry (in monitoring) +audit.show.entry=Show entry for user {0}. Entry was {1} \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/util/audit/AuditService.java =================================================================== diff -u -rd665bfd982e0a9e11818f0ed08c265d9c36adedb -r70cf04183bd09ee740203e876fd31a317badcbca --- lams_common/src/java/org/lamsfoundation/lams/util/audit/AuditService.java (.../AuditService.java) (revision d665bfd982e0a9e11818f0ed08c265d9c36adedb) +++ lams_common/src/java/org/lamsfoundation/lams/util/audit/AuditService.java (.../AuditService.java) (revision 70cf04183bd09ee740203e876fd31a317badcbca) @@ -64,7 +64,7 @@ private final String AUDIT_CHANGE_I18N_KEY = "audit.change.entry"; private final String AUDIT_HIDE_I18N_KEY = "audit.hide.entry"; - + private final String AUDIT_SHOW_I18N_KEY = "audit.show.entry"; protected MessageService messageService; private String getUserString() { @@ -92,14 +92,22 @@ log(moduleName, message); } - public void logHide(String moduleName, Long originalUserId, String originalUserLogin, String hiddenItem) { + public void logHideEntry(String moduleName, Long originalUserId, String originalUserLogin, String hiddenItem) { String[] args = new String[3]; args[0] = originalUserLogin+"("+originalUserId+")"; args[1] = hiddenItem; String message = messageService.getMessage(AUDIT_HIDE_I18N_KEY, args); log(moduleName, message); } + public void logShowEntry(String moduleName, Long originalUserId, String originalUserLogin, String hiddenItem) { + String[] args = new String[3]; + args[0] = originalUserLogin+"("+originalUserId+")"; + args[1] = hiddenItem; + String message = messageService.getMessage(AUDIT_SHOW_I18N_KEY, args); + log(moduleName, message); + } + /* *** Spring Injection Methods *************/ public MessageService getMessageService() { Index: lams_common/src/java/org/lamsfoundation/lams/util/audit/IAuditService.java =================================================================== diff -u -rd665bfd982e0a9e11818f0ed08c265d9c36adedb -r70cf04183bd09ee740203e876fd31a317badcbca --- lams_common/src/java/org/lamsfoundation/lams/util/audit/IAuditService.java (.../IAuditService.java) (revision d665bfd982e0a9e11818f0ed08c265d9c36adedb) +++ lams_common/src/java/org/lamsfoundation/lams/util/audit/IAuditService.java (.../IAuditService.java) (revision 70cf04183bd09ee740203e876fd31a317badcbca) @@ -54,6 +54,16 @@ * @param originalUserID the userID of the user who created the text initially * @param originalUserLogin the login of the user who created the text initially */ - public void logHide(String moduleName, Long originalUserId, String originalUserLogin, String hiddenItem); + public void logHideEntry(String moduleName, Long originalUserId, String originalUserLogin, String hiddenItem); + /** + * Log staff member showing a user entry. The username, date, moduleName and hidden entry are + * recorded in the audit log. Presumably the item was hidden previously. + * @param moduleName tool generating the audit entry + * @param hiddenItem String version of the item that has been hidden + * @param newText the text after it was changed + * @param originalUserID the userID of the user who created the text initially + * @param originalUserLogin the login of the user who created the text initially + */ + public void logShowEntry(String moduleName, Long originalUserId, String originalUserLogin, String hiddenItem); }