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

OO-4975: export course folder documents at root level too

parent e3d074c2
No related branches found
No related tags found
No related merge requests found
...@@ -31,6 +31,7 @@ import org.olat.core.util.vfs.VFSItem; ...@@ -31,6 +31,7 @@ import org.olat.core.util.vfs.VFSItem;
public class VFSContainerFilter implements VFSItemFilter { public class VFSContainerFilter implements VFSItemFilter {
@Override
public boolean accept(VFSItem vfsItem) { public boolean accept(VFSItem vfsItem) {
return (vfsItem instanceof VFSContainer); return (vfsItem instanceof VFSContainer);
} }
......
...@@ -49,7 +49,6 @@ import org.olat.core.util.vfs.LocalFolderImpl; ...@@ -49,7 +49,6 @@ import org.olat.core.util.vfs.LocalFolderImpl;
import org.olat.core.util.vfs.VFSContainer; import org.olat.core.util.vfs.VFSContainer;
import org.olat.core.util.vfs.VFSItem; import org.olat.core.util.vfs.VFSItem;
import org.olat.core.util.vfs.VFSManager; 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.VFSRevisionsAndThumbnailsFilter;
import org.olat.core.util.vfs.filters.VFSSystemItemFilter; import org.olat.core.util.vfs.filters.VFSSystemItemFilter;
import org.olat.course.CourseFactory; import org.olat.course.CourseFactory;
...@@ -326,7 +325,7 @@ public class CourseExportMediaResource implements MediaResource, StreamingOutput ...@@ -326,7 +325,7 @@ public class CourseExportMediaResource implements MediaResource, StreamingOutput
private void exportCoursefolder(PersistingCourseImpl sourceCourse, ZipOutputStream zout) throws IOException { private void exportCoursefolder(PersistingCourseImpl sourceCourse, ZipOutputStream zout) throws IOException {
VFSContainer courseFolder = sourceCourse.getIsolatedCourseBaseContainer(); VFSContainer courseFolder = sourceCourse.getIsolatedCourseBaseContainer();
List<VFSItem> hasChildren = courseFolder.getItems(new VFSContainerFilter()); List<VFSItem> hasChildren = courseFolder.getItems(new VFSSystemItemFilter());
if(hasChildren != null && !hasChildren.isEmpty()) { if(hasChildren != null && !hasChildren.isEmpty()) {
zout.putNextEntry(new ZipEntry("oocoursefolder.zip")); zout.putNextEntry(new ZipEntry("oocoursefolder.zip"));
// export course folder // export course folder
......
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