diff --git a/src/main/java/org/olat/core/commons/services/vfs/ui/version/VFSTrashController.java b/src/main/java/org/olat/core/commons/services/vfs/ui/version/VFSTrashController.java
index 59821e12874556d9f96b2a3448a1d32d2a00801e..740885d1cf4f50399233cf033d1c23cf74953c72 100644
--- a/src/main/java/org/olat/core/commons/services/vfs/ui/version/VFSTrashController.java
+++ b/src/main/java/org/olat/core/commons/services/vfs/ui/version/VFSTrashController.java
@@ -66,6 +66,7 @@ import org.olat.core.id.Identity;
import org.olat.core.util.Formatter;
import org.olat.core.util.Util;
import org.olat.core.util.async.ProgressDelegate;
+import org.olat.core.util.vfs.VFSItem;
import org.springframework.beans.factory.annotation.Autowired;
/**
@@ -210,7 +211,23 @@ public class VFSTrashController extends FormBasicController implements ProgressD
private void doDelete(List<VersionsDeletedFileRow> rowsToDelete) {
for(VersionsDeletedFileRow row:rowsToDelete) {
VFSRevision revision = vfsRepositoryService.getRevision(new VFSRevisionRefImpl(row.getRevisionKey()));
- vfsRepositoryService.deleteRevisions(getIdentity(), Collections.singletonList(revision));
+ doDelete(revision);
+ }
+ }
+
+ private void doDelete(VFSRevision revision) {
+ VFSMetadata metadata = revision.getMetadata();
+ vfsRepositoryService.deleteRevisions(getIdentity(), Collections.singletonList(revision));
+ dbInstance.commit();
+
+ if(metadata.isDeleted()) {
+ List<VFSRevision> revisions = vfsRepositoryService.getRevisions(metadata);
+ if(revisions.isEmpty()) {
+ VFSItem item = vfsRepositoryService.getItemFor(metadata);
+ if(item == null || !item.exists()) {
+ vfsRepositoryService.deleteMetadata(metadata);
+ }
+ }
}
}
diff --git a/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_de.properties
index 012abfbdb9ed88249c8861fca631a55d4d5f6547..0960dec93169ee4fa74824082e8df62252da6d82 100644
--- a/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_de.properties
@@ -232,7 +232,7 @@ question.assessmentType=Testart
question.assessmentType.both=Both
question.assessmentType.formative=Formative
question.assessmentType.summative=Summative
-question.correctionTime=Ben\u00F6tigte manuelle Korrekturszeit (Minuten)
+question.correctionTime=Ben\u00F6tigte manuelle Korrekturzeit (Minuten)
question.correctionTime.inMinutes={0}m
question.differentiation=Trennsch\u00E4rfe
question.differentiation.example=Wert zwischen -1.0 und 1.0, zum Beispiel 0.1
diff --git a/src/main/webapp/static/js/paella/player/example.html b/src/main/webapp/static/js/paella/player/example.html
index 85a3610ff3c270ecb360dac4eb173ab459d4ce96..6bf2e34a683b1afcb521f76f0baced042901e90e 100644
--- a/src/main/webapp/static/js/paella/player/example.html
+++ b/src/main/webapp/static/js/paella/player/example.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <meta http-equiv="Content-type" content="text/html; charset=utf-8;">
+ <meta http-equiv="Content-type" content="text/html; charset=utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Paella Engage Example</title>
<script type="text/javascript" src="javascript/swfobject.js"></script>
diff --git a/src/main/webapp/static/js/paella/player/index-custom.html b/src/main/webapp/static/js/paella/player/index-custom.html
index ed8aa05fe65a48a2af9870dd4113c8c75a1ba2fc..9ddfced273223f11670b1d9b0b06638db93ecb11 100644
--- a/src/main/webapp/static/js/paella/player/index-custom.html
+++ b/src/main/webapp/static/js/paella/player/index-custom.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <meta http-equiv="Content-type" content="text/html; charset=utf-8;">
+ <meta http-equiv="Content-type" content="text/html; charset=utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name = "viewport" content = "user-scalable=no, initial-scale=1.0, maximum-scale=1.0, width=device-width">
<title>Paella Engage Example</title>
diff --git a/src/main/webapp/static/js/paella/player/index-debug.html b/src/main/webapp/static/js/paella/player/index-debug.html
index 848e5f0105e8c1599ad56ce61129385cf9aafa23..4476f2985062ecc0fde1e0db3f880ec052e5cbe3 100644
--- a/src/main/webapp/static/js/paella/player/index-debug.html
+++ b/src/main/webapp/static/js/paella/player/index-debug.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <meta http-equiv="Content-type" content="text/html; charset=utf-8;">
+ <meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>Paella Engage Example</title>
<script type="text/javascript" src="javascript/polyfill.min.js"></script>
<script type="text/javascript" src="build/player/javascript/jquery.min.js"></script>
diff --git a/src/main/webapp/static/js/paella/player/index.html b/src/main/webapp/static/js/paella/player/index.html
index d3fb7d4c17bb49a22fb37f7ceb3ebd5555bd54ce..4e8b682eb70c68c27d533c070a7a6a80c1428925 100644
--- a/src/main/webapp/static/js/paella/player/index.html
+++ b/src/main/webapp/static/js/paella/player/index.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <meta http-equiv="Content-type" content="text/html; charset=utf-8;">
+ <meta http-equiv="Content-type" content="text/html; charset=utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name = "viewport" content = "user-scalable=no, initial-scale=1.0, maximum-scale=1.0, width=device-width">
<title>Paella Engage Example</title>