From 3c7502b019457b71294d6e737cffe3189bbfc199 Mon Sep 17 00:00:00 2001
From: Daniel Haag <daniel.haag@uibk.ac.at>
Date: Thu, 13 Aug 2020 12:06:41 +0200
Subject: [PATCH] openolat#216: fix and add
clearLearningPathIncompatibleSettings to affected nodes
---
.../nodewizard/coursenode/BCCourseNodeCopyConfigurator.java | 2 +-
.../coursenode/DialogCourseNodeCopyConfigurator.java | 5 +++++
.../nodewizard/coursenode/FOCourseNodeCopyConfigurator.java | 6 ++++++
.../coursenode/InfoCourseNodeCopyConfigurator.java | 5 +++++
.../coursenode/WikiCourseNodeCopyConfigurator.java | 6 ++++++
5 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/src/main/java/de/bps/course/nodewizard/coursenode/BCCourseNodeCopyConfigurator.java b/src/main/java/de/bps/course/nodewizard/coursenode/BCCourseNodeCopyConfigurator.java
index 6fc32690d29..c1d221d1444 100644
--- a/src/main/java/de/bps/course/nodewizard/coursenode/BCCourseNodeCopyConfigurator.java
+++ b/src/main/java/de/bps/course/nodewizard/coursenode/BCCourseNodeCopyConfigurator.java
@@ -66,6 +66,6 @@ public class BCCourseNodeCopyConfigurator extends AbstractCourseNodeCopyConfigur
@Override
public void clearLearningPathIncompatibleSettings() {
super.clearLearningPathIncompatibleSettings();
- ((BCCourseNode) this.srcCourseNode).removeCustomPreconditions();
+ ((BCCourseNode) this.targetCourseNode).removeCustomPreconditions();
}
}
diff --git a/src/main/java/de/bps/course/nodewizard/coursenode/DialogCourseNodeCopyConfigurator.java b/src/main/java/de/bps/course/nodewizard/coursenode/DialogCourseNodeCopyConfigurator.java
index b6c7d0824f0..5ea6c3eba2d 100644
--- a/src/main/java/de/bps/course/nodewizard/coursenode/DialogCourseNodeCopyConfigurator.java
+++ b/src/main/java/de/bps/course/nodewizard/coursenode/DialogCourseNodeCopyConfigurator.java
@@ -72,4 +72,9 @@ public class DialogCourseNodeCopyConfigurator extends AbstractCourseNodeCopyConf
configureConditions(srcConditionReader, targetConditionReader);
}
+ @Override
+ public void clearLearningPathIncompatibleSettings() {
+ super.clearLearningPathIncompatibleSettings();
+ ((DialogCourseNode) this.targetCourseNode).removeCustomPreconditions();
+ }
}
diff --git a/src/main/java/de/bps/course/nodewizard/coursenode/FOCourseNodeCopyConfigurator.java b/src/main/java/de/bps/course/nodewizard/coursenode/FOCourseNodeCopyConfigurator.java
index 5c83c2d1e1b..01a34f2455c 100644
--- a/src/main/java/de/bps/course/nodewizard/coursenode/FOCourseNodeCopyConfigurator.java
+++ b/src/main/java/de/bps/course/nodewizard/coursenode/FOCourseNodeCopyConfigurator.java
@@ -72,4 +72,10 @@ public class FOCourseNodeCopyConfigurator extends AbstractCourseNodeCopyConfigur
configureConditions(srcConditionReader, targetConditionReader);
}
+
+ @Override
+ public void clearLearningPathIncompatibleSettings() {
+ super.clearLearningPathIncompatibleSettings();
+ ((FOCourseNode) this.targetCourseNode).removeCustomPreconditions();
+ }
}
diff --git a/src/main/java/de/bps/course/nodewizard/coursenode/InfoCourseNodeCopyConfigurator.java b/src/main/java/de/bps/course/nodewizard/coursenode/InfoCourseNodeCopyConfigurator.java
index 7da6331bd0f..87d23b004c5 100644
--- a/src/main/java/de/bps/course/nodewizard/coursenode/InfoCourseNodeCopyConfigurator.java
+++ b/src/main/java/de/bps/course/nodewizard/coursenode/InfoCourseNodeCopyConfigurator.java
@@ -67,4 +67,9 @@ public class InfoCourseNodeCopyConfigurator extends AbstractCourseNodeCopyConfig
configureConditions(srcConditionAdmin, targetConditionAdmin);
}
+ @Override
+ public void clearLearningPathIncompatibleSettings() {
+ super.clearLearningPathIncompatibleSettings();
+ ((InfoCourseNode) this.targetCourseNode).removeCustomPreconditions();
+ }
}
diff --git a/src/main/java/de/bps/course/nodewizard/coursenode/WikiCourseNodeCopyConfigurator.java b/src/main/java/de/bps/course/nodewizard/coursenode/WikiCourseNodeCopyConfigurator.java
index 1c535b9cfab..6a7c371aa31 100644
--- a/src/main/java/de/bps/course/nodewizard/coursenode/WikiCourseNodeCopyConfigurator.java
+++ b/src/main/java/de/bps/course/nodewizard/coursenode/WikiCourseNodeCopyConfigurator.java
@@ -62,4 +62,10 @@ public class WikiCourseNodeCopyConfigurator extends AbstractCourseNodeCopyConfig
configureConditions(srcConditionEdit, targetConditionEdit);
}
+ @Override
+ public void clearLearningPathIncompatibleSettings() {
+ super.clearLearningPathIncompatibleSettings();
+ ((WikiCourseNode) this.targetCourseNode).removeCustomPreconditions();
+ }
+
}
--
GitLab