|
Index: lams_build/lib/lams/lams.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v
diff -u -r1.420.2.15 -r1.420.2.16
Binary files differ
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.5 -r1.60.2.6
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 18 Nov 2014 16:21:00 -0000 1.60.2.5
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 20 Jan 2015 08:52:47 -0000 1.60.2.6
@@ -206,10 +206,17 @@
if (mode != null) {
req.setAttribute(AttributeNames.PARAM_MODE, mode);
}
+
+ Boolean isPortfolioEnabled = lesson.getLearnerExportAvailable() != null ? lesson
+ .getLearnerExportAvailable() : Boolean.TRUE;
+ Organisation organisation = lesson.getOrganisation();
+ //in case of preview lesson (organisation is null) don't check organisation's settings
+ if (organisation != null) {
+ isPortfolioEnabled &= organisation.getEnableExportPortfolio();
+ }
req.setAttribute(AttributeNames.PARAM_LESSON_ID, String.valueOf(lessonId));
- req.setAttribute(AttributeNames.PARAM_EXPORT_PORTFOLIO_ENABLED, String.valueOf(lesson
- .getLearnerExportAvailable() != null ? lesson.getLearnerExportAvailable() : Boolean.TRUE));
+ req.setAttribute(AttributeNames.PARAM_EXPORT_PORTFOLIO_ENABLED, String.valueOf(isPortfolioEnabled));
req.setAttribute(AttributeNames.PARAM_PRESENCE_ENABLED,
String.valueOf(lesson.getLearnerPresenceAvailable()));
req.setAttribute(AttributeNames.PARAM_PRESENCE_IM_ENABLED, String.valueOf(lesson.getLearnerImAvailable()));
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml,v
diff -u -r1.22.2.3 -r1.22.2.4
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml 15 Oct 2014 07:48:47 -0000 1.22.2.3
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml 20 Jan 2015 08:53:12 -0000 1.22.2.4
@@ -132,6 +132,24 @@
+
+
+ @hibernate.property column="enable_live_edit"
+ length="1" not-null="true"
+
+
+
+
+
+ @hibernate.property column="enable_export_portfolio"
+ length="1" not-null="true"
+
+
+
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040039.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java,v
diff -u -r1.24 -r1.24.2.1
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java 9 Apr 2014 15:54:12 -0000 1.24
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java 20 Jan 2015 08:53:12 -0000 1.24.2.1
@@ -99,6 +99,12 @@
/** persistent field */
private Boolean enableSingleActivityLessons;
+
+ /** persistent field */
+ private Boolean enableLiveEdit;
+
+ /** persistent field */
+ private Boolean enableExportPortfolio;
/** persistent field */
private Date archivedDate;
@@ -115,6 +121,8 @@
this.enableGradebookForLearners = Boolean.FALSE;
this.enableGradebookForMonitors = Boolean.FALSE;
this.enableSingleActivityLessons = Boolean.FALSE;
+ this.enableLiveEdit = Boolean.FALSE;
+ this.enableExportPortfolio = Boolean.FALSE;
}
public Integer getOrganisationId() {
@@ -331,4 +339,20 @@
public void setEnableSingleActivityLessons(Boolean enableSingleActivityLessons) {
this.enableSingleActivityLessons = enableSingleActivityLessons;
}
+
+ public Boolean getEnableLiveEdit() {
+ return enableLiveEdit;
+ }
+
+ public void setEnableLiveEdit(Boolean enableLiveEdit) {
+ this.enableLiveEdit = enableLiveEdit;
+ }
+
+ public Boolean getEnableExportPortfolio() {
+ return enableExportPortfolio;
+ }
+
+ public void setEnableExportPortfolio(Boolean enableExportPortfolio) {
+ this.enableExportPortfolio = enableExportPortfolio;
+ }
}
\ No newline at end of file
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.11 -r1.118.2.12
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 22 Dec 2014 10:19:28 -0000 1.118.2.11
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 20 Jan 2015 08:52:51 -0000 1.118.2.12
@@ -926,6 +926,8 @@
Organisation organisation = (Organisation) userManagementService.findById(Organisation.class,
lessonDTO.getOrganisationID());
request.setAttribute("notificationsAvailable", organisation.getEnableCourseNotifications());
+ request.setAttribute("enableLiveEdit", organisation.getEnableLiveEdit());
+ request.setAttribute("enableExportPortfolio", organisation.getEnableExportPortfolio());
request.setAttribute("lesson", lessonDTO);
return mapping.findForward("monitorLesson");
Index: lams_monitoring/web/monitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/monitor.jsp,v
diff -u -r1.27.2.2 -r1.27.2.3
--- lams_monitoring/web/monitor.jsp 14 Dec 2014 04:45:56 -0000 1.27.2.2
+++ lams_monitoring/web/monitor.jsp 20 Jan 2015 08:52:51 -0000 1.27.2.3
@@ -40,6 +40,7 @@
hasContentFrame = false,
presenceEnabled = false,
hasDialog = false,
+ enableExportPortfolio = ${enableExportPortfolio},
LAMS_URL = '',
@@ -272,28 +273,36 @@
|
|
-
- checked="checked"
-
- />
+
+
+ checked="checked"
+
+ />
+
+
+
+
checked="checked"
- />
+ />
+
(0
)
+
disabled="disabled"
checked="checked"
- />
+ />
+
|