diff options
author | Stephan Schwaer | 2015-10-29 12:49:27 +0100 |
---|---|---|
committer | Stephan Schwaer | 2015-10-29 12:49:27 +0100 |
commit | 3a1a2638891ada3d239e07e65e27fcb62933a347 (patch) | |
tree | 40e2379fd9fb151bad57d4f05a15112710ee57c6 /dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java | |
parent | [client] Make caption of permission checks match col names in permission tables. (diff) | |
download | tutor-module-3a1a2638891ada3d239e07e65e27fcb62933a347.tar.gz tutor-module-3a1a2638891ada3d239e07e65e27fcb62933a347.tar.xz tutor-module-3a1a2638891ada3d239e07e65e27fcb62933a347.zip |
[client] Fix appearance of lecture and resulting NPE after deleting image the lecture linked to. Also make user feedback of deleting images more clear.
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java')
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java index b1c21cff..9161bdeb 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java @@ -712,7 +712,7 @@ public class ThriftActions { } String questionText; if (versionToBeDeleted != null && !versionToBeDeleted.isEmpty()) { - questionText = "Dieses Image hat folgende gültige Versionen:\n"; + questionText = "Das Image \" " + details.getImageName() + "\" hat folgende gültige Versionen:\n"; for (ImageVersionDetails version : versionToBeDeleted) { questionText += version.getVersionId() + "\n"; } @@ -721,13 +721,13 @@ public class ThriftActions { questionText = ""; } if (lecturesToBeDeleted != null && !lecturesToBeDeleted.isEmpty()) { - questionText += "Dieses Image ist mit folgenden Veranstaltungen verknüpft:\n"; + questionText += "Folgende Veranstaltungen sind mit dem Image verknüpft: \n"; for (LectureSummary lecture : lecturesToBeDeleted) { questionText += lecture.getLectureName() + "\n"; } questionText += "\n"; } - questionText += "Wollen Sie dieses Image wirklich löschen?"; + questionText += "Wollen Sie wirklich mit dem Löschen fortfahren?"; if (!userConfirmed(frame, questionText)) return; try { |