Skip to content
Snippets Groups Projects
Commit 3ced26a7 authored by srosse's avatar srosse
Browse files

Merge OpenOLAT 10.4 to OpenOLAT 10.5 with 3d40caeeb83ab6ec4c4629ef6a9e512d9843e9b5

parents b4535e8a 92a4f2f2
No related branches found
No related tags found
No related merge requests found
......@@ -24,6 +24,7 @@ import org.olat.core.gui.control.generic.iframe.DeliveryOptions;
import org.olat.core.util.xml.XStreamHelper;
import org.olat.course.condition.Condition;
import org.olat.course.condition.ExtendedCondition;
import org.olat.course.condition.operators.AttributeEndswithOperator;
import org.olat.course.condition.operators.AttributeStartswithOperator;
import org.olat.course.condition.operators.EqualsOperator;
import org.olat.course.condition.operators.GreaterThanEqualsOperator;
......@@ -139,6 +140,7 @@ public class CourseXStreamAliases {
readXstream.alias("HasAttributeOperator", HasAttributeOperator.class);
readXstream.alias("HasNotAttributeOperator", HasNotAttributeOperator.class);
readXstream.alias("AttributeStartswithOperator", AttributeStartswithOperator.class);
readXstream.alias("AttributeEndswithOperator", AttributeEndswithOperator.class);
//deleted attributes
readXstream.omitField(DeliveryOptions.class, "noJavascript");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment