Index: lams_admin/web/cleanupPreviewLessons.jsp
===================================================================
diff -u -rfba2480356aa5ddda0c8308eb917d72d16aa32eb -r4799cad19abde4669b7c14c40e36d56aec3a32fc
--- lams_admin/web/cleanupPreviewLessons.jsp (.../cleanupPreviewLessons.jsp) (revision fba2480356aa5ddda0c8308eb917d72d16aa32eb)
+++ lams_admin/web/cleanupPreviewLessons.jsp (.../cleanupPreviewLessons.jsp) (revision 4799cad19abde4669b7c14c40e36d56aec3a32fc)
@@ -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' : 'cleanupPreviewLessons.do',
- 'data' : {
- 'method' : 'deletePreviewLessons',
- 'limit' : 5
- },
- 'success' : function(response){
- try {
- previewCount = response[0];
- previewCountSpan.text(previewCount);
- allLessonCountSpan.text(response[1]);
- } catch(err) {
- alert('');
- previewCount = 0;
- }
- },
- 'error' : function(){
- alert('');
- 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' : '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('');
+ previewCountSpan.text('ERROR');
+ allLessonCountSpan.text('ERROR');
+ }
+ },
+ 'error' : function(){
+ alert('');
+ }
+ });
+}
${previewCount} / ${allLessonCount}
-
+
-
+