diff options
| author | ralph isenmann | 2022-01-24 17:07:42 +0100 |
|---|---|---|
| committer | ralph isenmann | 2022-01-24 17:07:42 +0100 |
| commit | ed39c00deee507a2c5534b42c518fc790d123ede (patch) | |
| tree | fcc1773f8cb23508a13bf9db21cb5a506e520d49 /dozentenmodul/src/main/java/org/openslx/dozmod/gui | |
| parent | [SERVER] Update Mysql Java driver class path (diff) | |
| download | tutor-module-ed39c00deee507a2c5534b42c518fc790d123ede.tar.gz tutor-module-ed39c00deee507a2c5534b42c518fc790d123ede.tar.xz tutor-module-ed39c00deee507a2c5534b42c518fc790d123ede.zip | |
[CLIENT] data container can not be used as images for lectures
- data container can only be a source in the bind mount configuration
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui')
3 files changed, 15 insertions, 2 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java index 9434ad25..f3ad5701 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java @@ -316,9 +316,13 @@ public class ImageListWindow extends ImageListWindowLayout implements DownloadCa if (!hasLatestVersion(image)) return; if (ContainerUtils.isContainerImageLinked(image)){ - ContainerUtils.showWarning(me,LOGGER); + ContainerUtils.showWarning(me, I18n.PAGE.getString("LectureImageList.WizardPage.errorMessage.containerLinkedWithLecture") ,LOGGER); + return; + } else if (ContainerUtils.isDataContainer(image)) { + ContainerUtils.showWarning(me, I18n.PAGE.getString("LectureImageList.WizardPage.errorMessage.imageIsDataContainer") ,LOGGER); return; } + new LectureWizard(SwingUtilities.getWindowAncestor(this), image, image.getLatestVersionId()).setVisible(true); } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java index 1bf231f2..57acf57d 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java @@ -199,9 +199,13 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements if (newImage == null) return; if (ContainerUtils.isContainerImageLinked(newImage)) { - ContainerUtils.showWarning(me, LOGGER); + ContainerUtils.showWarning(me, I18n.PAGE.getString("LectureImageList.WizardPage.errorMessage.containerLinkedWithLecture") ,LOGGER); + return; + } else if (ContainerUtils.isDataContainer(newImage)) { + ContainerUtils.showWarning(me, I18n.PAGE.getString("LectureImageList.WizardPage.errorMessage.imageIsDataContainer") ,LOGGER); return; } + final ImageMetaCallback callback = new ImageMetaCallback() { @Override public void fetchedImageDetails(ImageDetailsRead imageDetails, diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureImageListPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureImageListPage.java index 1c35df7b..b00bfbd7 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureImageListPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureImageListPage.java @@ -95,6 +95,11 @@ public class LectureImageListPage extends LectureImageListPageLayout { setErrorMessage(I18n.PAGE.getString("LectureImageList.WizardPage.errorMessage.containerLinkedWithLecture")); return false; } + else if (ContainerUtils.isDataContainer(selected)) { + setErrorMessage(I18n.PAGE.getString("LectureImageList.WizardPage.errorMessage.imageIsDataContainer")); + return false; + } + else if (selected != null && selected.isValid && ImagePerms.canLink(selected)) { state.image = selected; state.imageVersionId = selected.getLatestVersionId(); |