From ca14c715b621a123b1cedb99ec79d1e6d865203d Mon Sep 17 00:00:00 2001
From: uhensler <urs.hensler@frentix.com>
Date: Wed, 27 Mar 2019 12:35:01 +0100
Subject: [PATCH] OO-3937: Open even view only supported file formats in
Collabora
---
.../wopi/collabora/manager/CollaboraServiceImpl.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/olat/modules/wopi/collabora/manager/CollaboraServiceImpl.java b/src/main/java/org/olat/modules/wopi/collabora/manager/CollaboraServiceImpl.java
index ddea0ba3bdf..f1ec3ae6111 100644
--- a/src/main/java/org/olat/modules/wopi/collabora/manager/CollaboraServiceImpl.java
+++ b/src/main/java/org/olat/modules/wopi/collabora/manager/CollaboraServiceImpl.java
@@ -129,12 +129,19 @@ public class CollaboraServiceImpl implements CollaboraService, GenericEventListe
public String getEditorBaseUrl(File file) {
String suffix = FileUtils.getFileSuffix(file.getName());
Action action = wopiService.getAction(getDiscovery(), "edit", suffix);
+ if (action == null) {
+ action = wopiService.getAction(getDiscovery(), "view", suffix);
+ }
return action != null? action.getUrlSrc(): null;
}
@Override
public boolean accepts(String suffix, Mode mode) {
- return wopiService.hasAction(getDiscovery(), "edit", suffix);
+ boolean accepts = wopiService.hasAction(getDiscovery(), "edit", suffix);
+ if (!accepts && Mode.VIEW.equals(mode)) {
+ accepts = wopiService.hasAction(getDiscovery(), "view", suffix);
+ }
+ return accepts;
}
}
--
GitLab