From be6faf498f071b87212557bed86fc5e27d534a9a Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Fri, 1 Jul 2016 08:23:15 +0200
Subject: [PATCH] OO-2080: configurable deprecated flag for course elements
---
.../bps/course/nodes/cl/_spring/buildingblockContext.xml | 3 ++-
.../olat/course/nodes/AbstractCourseNodeConfiguration.java | 7 ++++++-
src/main/resources/serviceconfig/olat.properties | 1 +
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/de/bps/course/nodes/cl/_spring/buildingblockContext.xml b/src/main/java/de/bps/course/nodes/cl/_spring/buildingblockContext.xml
index 20568ab455c..d8c602b3efc 100644
--- a/src/main/java/de/bps/course/nodes/cl/_spring/buildingblockContext.xml
+++ b/src/main/java/de/bps/course/nodes/cl/_spring/buildingblockContext.xml
@@ -3,10 +3,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="cl" class="de.bps.course.nodes.cl.ChecklistCourseNodeConfiguration" scope="prototype">
<property name="enabled" value="${course.node.checklist.enabled}" />
+ <property name="deprecated" value="${course.node.checklist.deprecated}" />
<property name="order" value="220" />
</bean>
diff --git a/src/main/java/org/olat/course/nodes/AbstractCourseNodeConfiguration.java b/src/main/java/org/olat/course/nodes/AbstractCourseNodeConfiguration.java
index ad2106b047f..1449a043c5f 100644
--- a/src/main/java/org/olat/course/nodes/AbstractCourseNodeConfiguration.java
+++ b/src/main/java/org/olat/course/nodes/AbstractCourseNodeConfiguration.java
@@ -39,6 +39,7 @@ import org.olat.core.configuration.AbstractConfigOnOff;
public abstract class AbstractCourseNodeConfiguration extends AbstractConfigOnOff implements CourseNodeConfiguration {
private int order = 0;
+ private boolean configDeprecated = false;
private List<String> alternatives;
@@ -55,9 +56,13 @@ public abstract class AbstractCourseNodeConfiguration extends AbstractConfigOnOf
return order;
}
+ public void setDeprecated(boolean configDeprecated) {
+ this.configDeprecated = configDeprecated;
+ }
+
@Override
public boolean isDeprecated() {
- return false;
+ return configDeprecated;
}
@Override
diff --git a/src/main/resources/serviceconfig/olat.properties b/src/main/resources/serviceconfig/olat.properties
index d97e9fe1845..3a49b4c28b8 100644
--- a/src/main/resources/serviceconfig/olat.properties
+++ b/src/main/resources/serviceconfig/olat.properties
@@ -1049,6 +1049,7 @@ paypal.data.format.values=XML,JSON,SOAP11
########################################
course.node.linklist.enabled=true
course.node.checklist.enabled=false
+course.node.checklist.deprecated=false
course.node.dateenrollment.enabled=false
# The LTI course element
course.node.basiclti.enabled=true
--
GitLab