Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as =================================================================== diff -u -r2c3b4c2d3ce01699e33a66757ead5f790d0fc60c -r1feb16a101c9bfb25d6d738acf9d14858c451950 --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision 2c3b4c2d3ce01699e33a66757ead5f790d0fc60c) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision 1feb16a101c9bfb25d6d738acf9d14858c451950) @@ -342,7 +342,6 @@ else { openLearningDesign(seq); } monitorModel.setSequence(seq); - //monitorModel.setIsSequenceSet(true); monitorModel.broadcastViewUpdate('PROGRESS', null, monitorModel.getSelectedTab()); } Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as =================================================================== diff -u -rcffbd5b971c1bd0f8656d991d356593444f65d41 -r1feb16a101c9bfb25d6d738acf9d14858c451950 --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as (.../MonitorModel.as) (revision cffbd5b971c1bd0f8656d991d356593444f65d41) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as (.../MonitorModel.as) (revision 1feb16a101c9bfb25d6d738acf9d14858c451950) @@ -153,6 +153,7 @@ var obj:Object = app.layout.manager.checkAvailability(_activeSeq); locked = obj.locked; + } else { getMonitor().openLearningDesign(_activeSeq); } Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as =================================================================== diff -u -r62378710d8d3fea6bc83ff437ddb83bcf581cc2f -r1feb16a101c9bfb25d6d738acf9d14858c451950 --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as (.../LearnerTabView.as) (revision 62378710d8d3fea6bc83ff437ddb83bcf581cc2f) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as (.../LearnerTabView.as) (revision 1feb16a101c9bfb25d6d738acf9d14858c451950) @@ -158,8 +158,12 @@ } break; case 'PROGRESS' : - if (infoObj.tabID == _tabID && !mm.locked){ - mm.getMonitor().getProgressData(mm.getSequence()); + if (infoObj.tabID == _tabID){ + if(!mm.locked){ + mm.getMonitor().getProgressData(mm.getSequence()); + } else { + ApplicationParent.extCall("reloadWindow", null); + } } break; Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as =================================================================== diff -u -r6f216fba347b83cec9643e97905a407e168dd8c4 -r1feb16a101c9bfb25d6d738acf9d14858c451950 --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as (.../MonitorTabView.as) (revision 6f216fba347b83cec9643e97905a407e168dd8c4) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as (.../MonitorTabView.as) (revision 1feb16a101c9bfb25d6d738acf9d14858c451950) @@ -168,9 +168,13 @@ } break; case 'PROGRESS' : - if (infoObj.tabID == _tabID && !mm.locked){ - mm.getMonitor().getProgressData(mm.getSequence()) - } + if (infoObj.tabID == _tabID){ + if(!mm.locked){ + mm.getMonitor().getProgressData(mm.getSequence()); + } else { + ApplicationParent.extCall("reloadWindow", null); + } + } break; case 'RELOADPROGRESS' : if (infoObj.tabID == _tabID && !mm.locked){ Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/EditOnFlyServlet.java =================================================================== diff -u -r2c3b4c2d3ce01699e33a66757ead5f790d0fc60c -r1feb16a101c9bfb25d6d738acf9d14858c451950 --- lams_central/src/java/org/lamsfoundation/lams/authoring/web/EditOnFlyServlet.java (.../EditOnFlyServlet.java) (revision 2c3b4c2d3ce01699e33a66757ead5f790d0fc60c) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/EditOnFlyServlet.java (.../EditOnFlyServlet.java) (revision 1feb16a101c9bfb25d6d738acf9d14858c451950) @@ -57,6 +57,18 @@ auditService = getAuditService(); + // Set to expire far in the past. + response.setHeader("Expires", "Sat, 6 May 1995 12:00:00 GMT"); + + // Set standard HTTP/1.1 no-cache headers. + response.setHeader("Cache-Control", "no-store, no-cache, must-revalidate"); + + // Set IE extended HTTP/1.1 no-cache headers (use addHeader). + response.addHeader("Cache-Control", "post-check=0, pre-check=0"); + + // Set standard HTTP/1.0 no-cache header. + response.setHeader("Pragma", "no-cache"); + // TODO: Check roles/permissions on the User to see if they have access to edit this design userID = getUserID(request); learningDesignID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_LEARNINGDESIGN_ID)); Index: lams_monitoring/web/lams_monitoring.swf =================================================================== diff -u -r2c3b4c2d3ce01699e33a66757ead5f790d0fc60c -r1feb16a101c9bfb25d6d738acf9d14858c451950 Binary files differ Index: lams_monitoring/web/lams_monitoring_library.swf =================================================================== diff -u -r2c3b4c2d3ce01699e33a66757ead5f790d0fc60c -r1feb16a101c9bfb25d6d738acf9d14858c451950 Binary files differ