diff options
| author | Simon Rettberg | 2016-08-16 17:36:14 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2016-08-16 17:36:14 +0200 |
| commit | d64bc126938197853e347bf9cd0d2bfb01eb89f5 (patch) | |
| tree | ff33def67667aa70284ac04372bb66b7d9597b6e | |
| parent | [server] Add mail template for header and footer (diff) | |
| parent | [server] Clean up unused imports (diff) | |
| download | tutor-module-d64bc126938197853e347bf9cd0d2bfb01eb89f5.tar.gz tutor-module-d64bc126938197853e347bf9cd0d2bfb01eb89f5.tar.xz tutor-module-d64bc126938197853e347bf9cd0d2bfb01eb89f5.zip | |
Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1
2 files changed, 6 insertions, 5 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadSummaryPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadSummaryPageLayout.java index ecad4d36..c53fd907 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadSummaryPageLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadSummaryPageLayout.java @@ -16,7 +16,7 @@ public class ImageUploadSummaryPageLayout extends WizardPage { protected final JCheckBox chkCreateLecture; protected final JLabel lblHelpText; - public ImageUploadSummaryPageLayout(Wizard wizard, boolean allowCreateLecture) { + public ImageUploadSummaryPageLayout(Wizard wizard) { super(wizard, "Fertig!"); setDescription("Assistent abgeschlossen"); GridManager grid = new GridManager(this, 1); @@ -37,8 +37,7 @@ public class ImageUploadSummaryPageLayout extends WizardPage { grid.nextRow(); chkCreateLecture = new JCheckBox("Veranstaltung zu dieser VM erstellen"); - chkCreateLecture.setVisible(allowCreateLecture); - chkCreateLecture.setEnabled(false); + chkCreateLecture.setVisible(false); grid.add(chkCreateLecture); grid.nextRow(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadSummaryPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadSummaryPage.java index b5db050b..6370e204 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadSummaryPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadSummaryPage.java @@ -26,6 +26,7 @@ public class ImageUploadSummaryPage extends ImageUploadSummaryPageLayout { private boolean pageIsVisible = false; private boolean uploadListenerAdded = false; + private boolean allowCreateLecture = false; private final UploadWizardState state; private final TransferEventListener uploadListener = new TransferEventListener() { @@ -116,7 +117,7 @@ public class ImageUploadSummaryPage extends ImageUploadSummaryPageLayout { setPageComplete(true); } if (state.upload.getUploadTask() != null && state.upload.getUploadTask().isComplete()) { - chkCreateLecture.setEnabled(true); + chkCreateLecture.setVisible(allowCreateLecture); } } @@ -124,8 +125,9 @@ public class ImageUploadSummaryPage extends ImageUploadSummaryPageLayout { } public ImageUploadSummaryPage(Wizard wizard, UploadWizardState state, boolean allowCreateLecture) { - super(wizard, allowCreateLecture); + super(wizard); this.state = state; + this.allowCreateLecture = allowCreateLecture; setPageComplete(false); } |