CL-220: fix import / open course from UIBK with a password protection

src/main/java/org/olat/course/condition/additionalconditions/AdditionalCondition.java

@@ -24,9 +24,10 @@ import java.io.Serializable;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.control.Controller;
 import org.olat.core.gui.control.WindowControl;
+import org.olat.course.condition.Condition;
 import org.olat.course.nodes.AbstractAccessableCourseNode;
 
-public abstract class AdditionalCondition implements Cloneable, Serializable {
+public abstract class AdditionalCondition extends Condition implements Cloneable, Serializable {
 
 	private static final long serialVersionUID = -65033606683343812L;
 	

src/main/java/org/olat/course/nodes/AbstractAccessableCourseNode.java

@@ -59,7 +59,6 @@ public abstract class AbstractAccessableCourseNode extends GenericCourseNode {
 	private Condition preConditionAccess;
 
 	public static final String BLOCKED_BY_ORIGINAL_ACCESS_RULES = "blockedByOriginalAccessRules";
-	protected List<AdditionalCondition> additionalConditions = new ArrayList<AdditionalCondition>();
 
 	/**
 	 * Constructor, only used by implementing course nodes

src/main/java/org/olat/course/nodes/GenericCourseNode.java

@@ -44,6 +44,7 @@ import org.olat.core.util.nodes.GenericNode;
 import org.olat.core.util.xml.XStreamHelper;
 import org.olat.course.ICourse;
 import org.olat.course.condition.Condition;
+import org.olat.course.condition.additionalconditions.AdditionalCondition;
 import org.olat.course.condition.interpreter.ConditionErrorMessage;
 import org.olat.course.condition.interpreter.ConditionExpression;
 import org.olat.course.condition.interpreter.ConditionInterpreter;
@@ -72,6 +73,7 @@ public abstract class GenericCourseNode extends GenericNode implements CourseNod
 	private Condition preConditionVisibility;
 	private Condition preConditionAccess;
 	protected transient StatusDescription[] oneClickStatusCache = null;
+	protected List<AdditionalCondition> additionalConditions = new ArrayList<AdditionalCondition>();
 
 	/**
 	 * Generic course node constructor