From c020776b172ab6fdb3959a334637a9526e8459fa Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Mon, 14 Oct 2019 18:45:04 +0200
Subject: [PATCH] OO-4305: don't fallback in folder peek view if metadata are
migrated
---
.../java/org/olat/course/nodes/bc/BCPeekviewController.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/olat/course/nodes/bc/BCPeekviewController.java b/src/main/java/org/olat/course/nodes/bc/BCPeekviewController.java
index 9bf9ea2bfa4..fd6ec10afd7 100644
--- a/src/main/java/org/olat/course/nodes/bc/BCPeekviewController.java
+++ b/src/main/java/org/olat/course/nodes/bc/BCPeekviewController.java
@@ -26,6 +26,7 @@ import java.util.List;
import org.olat.core.commons.modules.bc.FolderModule;
import org.olat.core.commons.services.vfs.VFSMetadata;
+import org.olat.core.commons.services.vfs.VFSRepositoryModule;
import org.olat.core.commons.services.vfs.VFSRepositoryService;
import org.olat.core.commons.services.vfs.ui.media.VFSMetadataMediaResource;
import org.olat.core.gui.UserRequest;
@@ -70,6 +71,8 @@ public class BCPeekviewController extends BasicController implements Controller
@Autowired
private FolderModule folderModule;
@Autowired
+ private VFSRepositoryModule vfsModule;
+ @Autowired
private VFSRepositoryService vfsRepositoryService;
/**
@@ -90,7 +93,7 @@ public class BCPeekviewController extends BasicController implements Controller
VFSMetadata metadata = vfsRepositoryService.getMetadataFor(rootFolder);
// don't force migration here to prevent overloading big OpenOLAT instances
- if("migrated".equals(metadata.getMigrated())) {
+ if(vfsModule.isMigrated() || "migrated".equals(metadata.getMigrated())) {
fileMetadata(links, metadata, itemsToDisplay);
} else {
fileFallback(links, rootFolder, itemsToDisplay);
--
GitLab