Index: lams_admin/web/cleanupPreviewLessons.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/Attic/cleanupPreviewLessons.jsp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_admin/web/cleanupPreviewLessons.jsp	22 Sep 2016 10:14:37 -0000	1.1.2.1
+++ lams_admin/web/cleanupPreviewLessons.jsp	27 Sep 2016 07:23:38 -0000	1.1.2.2
@@ -18,54 +18,54 @@
 		}
 		
 		deleteButton.prop('disabled', true);
+		$('#deletingBox').show();
 		
-		var previewCountSpan = $('#previewCount'),
-			allLessonCountSpan = $('#allLessonCount'),
-			deletingBox = $('#deletingBox').show();
-		
 		// delete lesson in batches of 5 until done
-		while (previewCount > 0) {
-			$.ajax({
-				'async'   : false,
-				'cache'   : false,
-				'url'     : '<lams:WebAppURL />cleanupPreviewLessons.do',
-				'data'    : {
-					'method' : 'deletePreviewLessons',
-					'limit'  : 5
-				},
-				'success' : function(response){
-					try {
-						previewCount = response[0];
-						previewCountSpan.text(previewCount);
-						allLessonCountSpan.text(response[1]);
-					} catch(err) {
-						alert('<fmt:message key="msg.cleanup.preview.lesson.error" />');
-						previewCount = 0;
-					}
-				},
-				'error'	  : function(){
-					alert('<fmt:message key="msg.cleanup.preview.lesson.error" />');
-					previewCount = 0;
-				}
-			});
-		}
-		
-		deletingBox.hide();
-		if (previewCount > 0) {
-			deleteButton.prop('disabled', false);
-		}
+		deletePreviewLessons(previewCount, $('#previewCount'), $('#allLessonCount'));
 	});
 });
+
+function deletePreviewLessons(previewCount, previewCountSpan, allLessonCountSpan){
+	if (previewCount <= 0) {
+		$('#deletingBox').hide();
+		return;
+	}
+	$.ajax({
+		'cache'   : false,
+		'url'     : '<lams:WebAppURL />cleanupPreviewLessons.do',
+		'data'    : {
+			'method' : 'deletePreviewLessons',
+			'limit'  : 5
+		},
+		'success' : function(response){
+			try {
+				previewCount = response[0];
+				previewCountSpan.text(previewCount);
+				allLessonCountSpan.text(response[1]);
+				setTimeout(function(){
+					deletePreviewLessons(previewCount, previewCountSpan, allLessonCountSpan);
+				}, 500);
+			} catch(err) {
+				alert('<fmt:message key="msg.cleanup.preview.lesson.error" />');
+				previewCountSpan.text('ERROR');
+				allLessonCountSpan.text('ERROR');
+			}
+		},
+		'error'	  : function(){
+			alert('<fmt:message key="msg.cleanup.preview.lesson.error" />');
+		}
+	});
+}
 </script>
 
 <p><a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
 <html:errors />
 
 <fmt:message key="label.cleanup.preview.lesson.count" />&nbsp;<span id="previewCount">${previewCount}</span> / <span id="allLessonCount">${allLessonCount}</span>
-<p id="deletingBox" style="display: none;">
+<div id="deletingBox" style="display: none">
 	<fmt:message key="label.cleanup.preview.lesson.progress" />
-</p>
+</div>
 
 <div class="pull-right">
 	<button id="deleteButton" class="btn btn-primary loffset5"><fmt:message key="admin.delete"/></button>
Index: lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml,v
diff -u -r1.14.2.11 -r1.14.2.12
--- lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml	27 Sep 2016 06:22:54 -0000	1.14.2.11
+++ lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml	27 Sep 2016 07:24:57 -0000	1.14.2.12
@@ -61,6 +61,7 @@
 			<props>
 				<prop key="createToolSession*">PROPAGATION_REQUIRED</prop>
 				<prop key="notifyTool*">PROPAGATION_REQUIRED</prop>
+				<prop key="notifyToolToDeleteContent">PROPAGATION_REQUIRES_NEW</prop>
 			    <prop key="update*">PROPAGATION_REQUIRED</prop>
 			    <prop key="remove*">PROPAGATION_REQUIRED</prop>
 			    <!-- It needs to be committed before the subsequent isReadOnly check -->
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20160927.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java,v
diff -u -r1.14.2.11 -r1.14.2.12
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java	15 Jun 2016 08:06:58 -0000	1.14.2.11
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java	27 Sep 2016 07:23:36 -0000	1.14.2.12
@@ -543,6 +543,7 @@
 	    for (SpreadsheetUser user : users) {
 		UserModifiedSpreadsheet modified = user.getUserModifiedSpreadsheet();
 		if (modified != null) {
+		    user.setUserModifiedSpreadsheet(null);
 		    userModifiedSpreadsheetDao.removeObject(UserModifiedSpreadsheet.class, modified.getUid());
 		}
 	    }
@@ -645,7 +646,7 @@
     public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) {
 	return null;
     }
-    
+
     @Override
     public List<ToolOutput> getToolOutputs(String name, Long toolContentId) {
 	return new ArrayList<ToolOutput>();