Index: lams_monitoring/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r271d374f37c513e19ec64591efa9df228923ef09 -r2a0ac10fbc2946f7b4a70504cda4b72a761a4679 --- lams_monitoring/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 271d374f37c513e19ec64591efa9df228923ef09) +++ lams_monitoring/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 2a0ac10fbc2946f7b4a70504cda4b72a761a4679) @@ -405,5 +405,6 @@ tour.progress.email.confure.content =Set up the dates to automatically send emails with a summary of learners progress to all monitors for this lesson. error.date.in.past =Selected date is in the past. - +audit.lesson.removed =Lesson "{0}" ({1}) status changed to removed. +audit.lesson.removed.permanently =Lesson "{0}" ({1}) removed permanently. #======= End labels: Exported 398 labels for en AU ===== Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== diff -u -r8714ac689fdad46746bbb7f28005ec080d1d4ba6 -r2a0ac10fbc2946f7b4a70504cda4b72a761a4679 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision 8714ac689fdad46746bbb7f28005ec080d1d4ba6) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision 2a0ac10fbc2946f7b4a70504cda4b72a761a4679) @@ -145,6 +145,8 @@ private static Logger log = Logger.getLogger(MonitoringService.class); private static final String AUDIT_LESSON_CREATED_KEY = "audit.lesson.created"; + private static final String AUDIT_LESSON_REMOVED_KEY = "audit.lesson.removed"; + private static final String AUDIT_LESSON_REMOVED_PERMANENTLY_KEY = "audit.lesson.removed.permanently"; private ILessonDAO lessonDAO; @@ -867,6 +869,9 @@ securityService.isLessonMonitor(lessonId, userId, "remove lesson", true); Lesson requestedLesson = lessonDAO.getLesson(new Long(lessonId)); setLessonState(requestedLesson, Lesson.REMOVED_STATE); + + writeAuditLog(MonitoringService.AUDIT_LESSON_REMOVED_KEY, + new Object[] { requestedLesson.getLessonName(), requestedLesson.getLessonId() }); } @SuppressWarnings("unchecked") @@ -937,6 +942,9 @@ // finally remove the learning design lessonDAO.delete(learningDesign); + + writeAuditLog(MonitoringService.AUDIT_LESSON_REMOVED_PERMANENTLY_KEY, + new Object[] { lesson.getLessonName(), lesson.getLessonId() }); } @Override