From fbfe4cd9c946c442aee8426601785ce42e410469 Mon Sep 17 00:00:00 2001
From: Daniel Haag <daniel.haag@uibk.ac.at>
Date: Mon, 26 Aug 2019 11:22:51 +0200
Subject: [PATCH] openolat#50: show message when user tries to delete a still
active course
---
.../org/olat/repository/_i18n/LocalStrings_de.properties | 1 +
.../org/olat/repository/_i18n/LocalStrings_en.properties | 1 +
.../olat/repository/ui/_content/lifecycle_change.html | 9 +++++++--
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/repository/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/repository/_i18n/LocalStrings_de.properties
index c7e64828636..465f0d08672 100644
--- a/src/main/java/org/olat/repository/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/repository/_i18n/LocalStrings_de.properties
@@ -260,6 +260,7 @@ details.delete.acknowledge.error=Bitte best\u00e4tigen.
details.delete.acknowledge.msg=Alle Dateien werden definitiv gel\u00f6scht und k\u00f6nnen nicht mehr wiederhergestellt werden.
details.delete.alt={0} l\u00f6schen
details.delete.locked.until.desc=Diese Lernressource kann nicht vor dem {0} gel\u00f6scht werden.
+details.delete.locked.open.desc=Diese Lernressource muss zuerst beendet werden.
details.delete.soft.acknowledge.msg=Die Lernressource wird als gel\u00f6scht markiert.
details.delete.soft.desc=Mit dieser Funktion wird die Lernressource als gel\u00f6scht markiert.
details.delete.soft.desc.1=Die Benutzerdaten werden aus dem Kurs entfernt.
diff --git a/src/main/java/org/olat/repository/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/repository/_i18n/LocalStrings_en.properties
index b011f32e558..3b2c87a94e0 100644
--- a/src/main/java/org/olat/repository/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/repository/_i18n/LocalStrings_en.properties
@@ -268,6 +268,7 @@ details.delete.notOwner=not owner
details.delete.references=Do you wish to delete the referenced learning resources too?
details.delete.safety.interval=14
details.delete.locked.until.desc=This learning resource can't be deleted until {0}.
+details.delete.locked.open.desc=This learning resource can only be deleted when it has been closed before.
details.delete.soft.acknowledge.msg=The learning resource will be marked as deleted.
details.delete.soft.auto.desc=<strong>The course will be automatically deleted at {0}.</strong>
details.delete.soft.desc=Using this method the learning resource will be marked as deleted.
diff --git a/src/main/java/org/olat/repository/ui/_content/lifecycle_change.html b/src/main/java/org/olat/repository/ui/_content/lifecycle_change.html
index 15d0b0bfe08..d5011e40095 100644
--- a/src/main/java/org/olat/repository/ui/_content/lifecycle_change.html
+++ b/src/main/java/org/olat/repository/ui/_content/lifecycle_change.html
@@ -18,13 +18,18 @@
$r.render("delete")
</div>
</div>
-#end
+#else
#if($r.isNotNull($deleteLockedUntil))
- <h4>$r.translate("details.delete")</h4>
<div class="o_error">
<p>$r.translate("details.delete.locked.until.desc", $deleteLockedUntil)</p>
</div>
+#else
+ <div class="o_error">
+ <p>$r.translate("details.delete.locked.open.desc")</p>
+ </div>
+#end
+
#end
</fieldset>
--
GitLab