Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as =================================================================== diff -u -r46355d89e474d867fa25604afa28bf7d160541bb -r9f46456951a80c8926d8b6e209bc51864ce30aa2 --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision 46355d89e474d867fa25604afa28bf7d160541bb) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision 9f46456951a80c8926d8b6e209bc51864ce30aa2) @@ -194,6 +194,10 @@ Application.getInstance().getComms().getRequest('monitoring/monitoring.do?method=getLessonDetails&lessonID=' + String(lessonID) + '&userID=' + _root.userID,callback, false); } + public function closeAndRefresh() { + ApplicationParent.extCall("closeWindowRefresh", null); + } + public function reloadLessonToMonitor(){ loadLessonToMonitor(_root.lessonID); } Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as =================================================================== diff -u -r1a175bfe9b4bc5309f3319accf2068eba3a9e902 -r9f46456951a80c8926d8b6e209bc51864ce30aa2 --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as (.../MonitorController.as) (revision 1a175bfe9b4bc5309f3319accf2068eba3a9e902) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as (.../MonitorController.as) (revision 9f46456951a80c8926d8b6e209bc51864ce30aa2) @@ -371,7 +371,18 @@ if(!_isBusy){ setBusy(); var stateID:Number = evt.target.changeStatus_cmb.selectedItem.data; - switch(stateID){ + switch(stateID){ + case LessonTabView.REMOVE_CBI : + trace('removing...'); + var confirmMsg:String = Dictionary.getValue('ls_remove_confirm_msg'); + var warningMsg:String = Dictionary.getValue('ls_remove_warning_msg', [_monitorModel.getSequence().getSequenceName()]); + + var warningNoHandler = Proxy.create(_monitorModel, _monitorModel.removeSequence); + var confirmOkHandler = Proxy.create(this, removalAlert, warningMsg, null, warningNoHandler); + + removalAlert(confirmMsg, confirmOkHandler, null); + + break; case LessonTabView.NULL_CBI : // error msg trace('nothing selected...'); @@ -391,16 +402,6 @@ case LessonTabView.UNARCHIVE_CBI : trace('unarchiving...'); _monitorModel.unarchiveSequence(); - case LessonTabView.REMOVE_CBI : - trace('removing...'); - var confirmMsg:String = Dictionary.getValue('ls_remove_confirm_msg'); - var warningMsg:String = Dictionary.getValue('ls_remove_warning_msg', [_monitorModel.getSequence().getSequenceName()]); - - var warningNoHandler = Proxy.create(_monitorModel, _monitorModel.removeSequence); - var confirmOkHandler = Proxy.create(this, removalAlert, warningMsg, null, warningNoHandler); - - removalAlert(confirmMsg, confirmOkHandler, null); - break; default : trace('no such combo box item'); Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as =================================================================== diff -u -rb92c9032ebbd455eb0d4601d29ae2f8f6e8468e2 -r9f46456951a80c8926d8b6e209bc51864ce30aa2 --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as (.../MonitorModel.as) (revision b92c9032ebbd455eb0d4601d29ae2f8f6e8468e2) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as (.../MonitorModel.as) (revision 9f46456951a80c8926d8b6e209bc51864ce30aa2) @@ -194,7 +194,7 @@ } public function removeSequence():Void{ - var callback:Function = Proxy.create(_monitor, _monitor.reloadLessonToMonitor); + var callback:Function = Proxy.create(_monitor, _monitor.closeAndRefresh); Application.getInstance().getComms().getRequest('monitoring/monitoring.do?method=removeLesson&lessonID=' + String(_activeSeq.ID) + '&userID=' + _root.userID,callback, false); }