Index: lams_monitoring/web/includes/javascript/monitorLesson.js =================================================================== diff -u -r4dd828cc4b7888b3998f14ca9c13eab7cf7c783e -rfaa25016ecf0fd068694f3add01fc6532791a534 --- lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 4dd828cc4b7888b3998f14ca9c13eab7cf7c783e) +++ lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision faa25016ecf0fd068694f3add01fc6532791a534) @@ -1102,16 +1102,22 @@ $('.modal-body', '#forceBackwardsDialog').empty().append($('#forceBackwardsDialogContents').show()); $('#forceBackwardsRemoveContentNoButton', forceBackwardsDialogContents).click(function(){ - var forceBackwardsDialog = $('#forceBackwardsDialog'); - forceCompleteExecute(forceBackwardsDialog.data('learners'), null, + var forceBackwardsDialog = $('#forceBackwardsDialog'), + learners = forceBackwardsDialog.data('learners'), + moveAll = learners === true; + forceCompleteExecute(moveAll ? null : learners, + moveAll ? forceBackwardsDialog.data('currentActivityId') : null, forceBackwardsDialog.data('activityId'), false); forceBackwardsDialog.modal('hide'); }); $('#forceBackwardsRemoveContentYesButton', forceBackwardsDialogContents).click(function(){ var forceBackwardsDialog = $('#forceBackwardsDialog'); - forceCompleteExecute(forceBackwardsDialog.data('learners'), null, + learners = forceBackwardsDialog.data('learners'), + moveAll = learners === true; + forceCompleteExecute(moveAll ? null : learners, + moveAll ? forceBackwardsDialog.data('currentActivityId') : null, forceBackwardsDialog.data('activityId'), true); forceBackwardsDialog.modal('hide'); @@ -1503,6 +1509,7 @@ $('#forceBackwardsMsg', '#forceBackwardsDialog').html(msgString); $('#forceBackwardsDialog').data({ 'learners' : learners, + 'currentActivityId' : currentActivityId, 'activityId': targetActivityId}); $('#forceBackwardsDialog').modal('show'); // so autoRefreshBlocked = false is not set