Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java,v
diff -u -r1.60.2.27 -r1.60.2.28
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 27 Sep 2016 06:22:57 -0000 1.60.2.27
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 7 Nov 2016 11:13:51 -0000 1.60.2.28
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/editLessonIntro.jsp,v
diff -u -r1.3.2.3 -r1.3.2.4
--- lams_central/web/editLessonIntro.jsp 7 Nov 2016 04:42:26 -0000 1.3.2.3
+++ lams_central/web/editLessonIntro.jsp 7 Nov 2016 11:17:56 -0000 1.3.2.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java,v
diff -u -r1.118.2.50 -r1.118.2.51
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 30 Sep 2016 07:42:05 -0000 1.118.2.50
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 7 Nov 2016 11:17:55 -0000 1.118.2.51
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/includes/javascript/monitorLesson.js,v
diff -u -r1.44.2.47 -r1.44.2.48
--- lams_monitoring/web/includes/javascript/monitorLesson.js 7 Nov 2016 04:43:25 -0000 1.44.2.47
+++ lams_monitoring/web/includes/javascript/monitorLesson.js 7 Nov 2016 11:17:55 -0000 1.44.2.48
@@ -316,6 +316,8 @@
}
updateContributeActivities(response.contributeActivities);
+ $('.lead','#tabLessonLessonName').html(''+response.lessonName+'');
+ $('#description').html(response.lessonDescription);
}
});