From ab1b107ec1bed40895f10b4a865f003f9d39dd50 Mon Sep 17 00:00:00 2001 From: uhensler <urs.hensler@frentix.com> Date: Mon, 18 Nov 2019 11:38:36 +0100 Subject: [PATCH] OO-4355: Avoid RS when open a saved presentation with a filter of "Type of curriculum element" --- .../analysis/manager/AnalysisPresentationXStream.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/olat/modules/quality/analysis/manager/AnalysisPresentationXStream.java b/src/main/java/org/olat/modules/quality/analysis/manager/AnalysisPresentationXStream.java index 5884f1799e0..193f6d21ff1 100644 --- a/src/main/java/org/olat/modules/quality/analysis/manager/AnalysisPresentationXStream.java +++ b/src/main/java/org/olat/modules/quality/analysis/manager/AnalysisPresentationXStream.java @@ -25,7 +25,9 @@ import org.olat.basesecurity.model.OrganisationRefImpl; import org.olat.core.logging.Tracing; import org.olat.core.util.StringHelper; import org.olat.core.util.xml.XStreamHelper; +import org.olat.modules.curriculum.CurriculumElementTypeRef; import org.olat.modules.curriculum.model.CurriculumElementRefImpl; +import org.olat.modules.curriculum.model.CurriculumElementTypeRefImpl; import org.olat.modules.curriculum.model.CurriculumRefImpl; import org.olat.modules.quality.analysis.AnalysisSearchParameter; import org.olat.modules.quality.analysis.GroupBy; @@ -53,7 +55,7 @@ public class AnalysisPresentationXStream { Class<?>[] types = new Class[] { MultiGroupBy.class, GroupBy.class, AnalysisSearchParameter.class, QualityDataCollectionRefImpl.class, RepositoryEntryRefImpl.class, IdentityRefImpl.class, OrganisationRefImpl.class, CurriculumRefImpl.class, - CurriculumElementRefImpl.class, TaxonomyLevelRefImpl.class }; + CurriculumElementRefImpl.class, CurriculumElementTypeRef.class, TaxonomyLevelRefImpl.class }; xstream.addPermission(new ExplicitTypePermission(types)); xstream.alias("multiGroupBy", MultiGroupBy.class); xstream.alias("groupBy", GroupBy.class); @@ -64,6 +66,7 @@ public class AnalysisPresentationXStream { xstream.alias("OrganisationRef", OrganisationRefImpl.class); xstream.alias("CurriculumRef", CurriculumRefImpl.class); xstream.alias("CurriculumElementRef", CurriculumElementRefImpl.class); + xstream.alias("CurriculumElementTypeRef", CurriculumElementTypeRefImpl.class); xstream.alias("TaxonomyLevelRef", TaxonomyLevelRefImpl.class); } -- GitLab