Merge remote-tracking branch 'upstream/OpenOLAT_14.2' into OpenOLAT_14.2.uibk

330cb39a · User expired · e48a7e81 · d720308c · 330cb39a · 330cb39a
Commit 330cb39a authored 5 years ago by User expired
--- 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);
+				}
+			}
 		}
 	}
 	

--- 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

--- a/src/main/webapp/static/js/paella/player/example.html
+++ b/src/main/webapp/static/js/paella/player/example.html
 <!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>

--- a/src/main/webapp/static/js/paella/player/index-custom.html
+++ b/src/main/webapp/static/js/paella/player/index-custom.html
 <!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>

--- a/src/main/webapp/static/js/paella/player/index-debug.html
+++ b/src/main/webapp/static/js/paella/player/index-debug.html
 <!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>

--- a/src/main/webapp/static/js/paella/player/index.html
+++ b/src/main/webapp/static/js/paella/player/index.html
 <!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>