From e7db11c0865fa001a87e68363ba47e81160b2c08 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Wed, 14 Oct 2020 14:19:29 +0200
Subject: [PATCH] OO-4975: export course folder documents at root level too
---
.../org/olat/core/util/vfs/filters/VFSContainerFilter.java | 1 +
.../java/org/olat/course/export/CourseExportMediaResource.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/core/util/vfs/filters/VFSContainerFilter.java b/src/main/java/org/olat/core/util/vfs/filters/VFSContainerFilter.java
index 08fa46e0b90..cf20da2477f 100644
--- a/src/main/java/org/olat/core/util/vfs/filters/VFSContainerFilter.java
+++ b/src/main/java/org/olat/core/util/vfs/filters/VFSContainerFilter.java
@@ -31,6 +31,7 @@ import org.olat.core.util.vfs.VFSItem;
public class VFSContainerFilter implements VFSItemFilter {
+ @Override
public boolean accept(VFSItem vfsItem) {
return (vfsItem instanceof VFSContainer);
}
diff --git a/src/main/java/org/olat/course/export/CourseExportMediaResource.java b/src/main/java/org/olat/course/export/CourseExportMediaResource.java
index 91f4319803a..a986acbefb7 100644
--- a/src/main/java/org/olat/course/export/CourseExportMediaResource.java
+++ b/src/main/java/org/olat/course/export/CourseExportMediaResource.java
@@ -49,7 +49,6 @@ import org.olat.core.util.vfs.LocalFolderImpl;
import org.olat.core.util.vfs.VFSContainer;
import org.olat.core.util.vfs.VFSItem;
import org.olat.core.util.vfs.VFSManager;
-import org.olat.core.util.vfs.filters.VFSContainerFilter;
import org.olat.core.util.vfs.filters.VFSRevisionsAndThumbnailsFilter;
import org.olat.core.util.vfs.filters.VFSSystemItemFilter;
import org.olat.course.CourseFactory;
@@ -326,7 +325,7 @@ public class CourseExportMediaResource implements MediaResource, StreamingOutput
private void exportCoursefolder(PersistingCourseImpl sourceCourse, ZipOutputStream zout) throws IOException {
VFSContainer courseFolder = sourceCourse.getIsolatedCourseBaseContainer();
- List<VFSItem> hasChildren = courseFolder.getItems(new VFSContainerFilter());
+ List<VFSItem> hasChildren = courseFolder.getItems(new VFSSystemItemFilter());
if(hasChildren != null && !hasChildren.isEmpty()) {
zout.putNextEntry(new ZipEntry("oocoursefolder.zip"));
// export course folder
--
GitLab