Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
===================================================================
diff -u -rde884cf8c730a25d2f2296f7a768d3fd45508c99 -r169f966c6669b38b4180cab310ff7b8616ee1990
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision 169f966c6669b38b4180cab310ff7b8616ee1990)
@@ -167,7 +167,6 @@
req.setAttribute("learnerURL", "learnerURL");
req.setAttribute("lesson", lesson);
req.setAttribute("displayDesignImage", lesson.isDisplayDesignImage());
- req.setAttribute("isMonitor", lesson.getLessonClass().isStaffMember(getRealUser(user)));
// check if we need to create learning design SVG
if (lesson.isDisplayDesignImage()) {
Index: lams_central/web/editLessonIntro.jsp
===================================================================
diff -u -rd1bd9bd5e64acfc2e661fccd282079b1e60c7c7f -r169f966c6669b38b4180cab310ff7b8616ee1990
--- lams_central/web/editLessonIntro.jsp (.../editLessonIntro.jsp) (revision d1bd9bd5e64acfc2e661fccd282079b1e60c7c7f)
+++ lams_central/web/editLessonIntro.jsp (.../editLessonIntro.jsp) (revision 169f966c6669b38b4180cab310ff7b8616ee1990)
@@ -21,7 +21,8 @@
},
success: function() {
alert('');
- if ( typeof parent.window.closeIntroductionDialog !== "undefined") {
+ if ( typeof parent.window.refreshMonitor !== "undefined") {
+ parent.window.refreshMonitor('lesson', false);
parent.window.closeIntroductionDialog();
}
}
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
diff -u -r6c25dd12df73e7840338036b707f0d461c4bdcad -r169f966c6669b38b4180cab310ff7b8616ee1990
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision 6c25dd12df73e7840338036b707f0d461c4bdcad)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision 169f966c6669b38b4180cab310ff7b8616ee1990)
@@ -48,6 +48,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
+import org.apache.commons.lang.StringEscapeUtils;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -1040,6 +1041,9 @@
responseJSON.put("numberPossibleLearners", getLessonService().getCountLessonLearners(lessonId, null));
responseJSON.put("lessonStateID", lesson.getLessonStateId());
+ responseJSON.put("lessonName", StringEscapeUtils.escapeHtml(lesson.getLessonName()));
+ responseJSON.put("lessonDescription", lesson.getLessonDescription());
+
Date startOrScheduleDate = lesson.getStartDateTime() == null ? lesson.getScheduleStartDate()
: lesson.getStartDateTime();
if (startOrScheduleDate != null) {
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
diff -u -rd1bd9bd5e64acfc2e661fccd282079b1e60c7c7f -r169f966c6669b38b4180cab310ff7b8616ee1990
--- lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision d1bd9bd5e64acfc2e661fccd282079b1e60c7c7f)
+++ lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 169f966c6669b38b4180cab310ff7b8616ee1990)
@@ -316,6 +316,8 @@
}
updateContributeActivities(response.contributeActivities);
+ $('.lead','#tabLessonLessonName').html(''+response.lessonName+'');
+ $('#description').html(response.lessonDescription);
}
});