diff options
author | Jonathan Bauer | 2015-08-17 16:07:51 +0200 |
---|---|---|
committer | Jonathan Bauer | 2015-08-17 16:07:51 +0200 |
commit | 807fa5583eafa546e6e1260fa93a2b50ba0827e6 (patch) | |
tree | 17f1f132351127d317c5858715dda2bf771dea2c /dozentenmodul | |
parent | Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1 (diff) | |
download | tutor-module-807fa5583eafa546e6e1260fa93a2b50ba0827e6.tar.gz tutor-module-807fa5583eafa546e6e1260fa93a2b50ba0827e6.tar.xz tutor-module-807fa5583eafa546e6e1260fa93a2b50ba0827e6.zip |
[client] do save checkboxes in upload wizard
Diffstat (limited to 'dozentenmodul')
3 files changed, 15 insertions, 13 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java index e479085b..7926ac11 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java @@ -25,7 +25,7 @@ public abstract class ImageMetaDataPageLayout extends WizardPage { protected JTextArea descriptionText; protected JCheckBox licencedSoftwareCheck; protected JCheckBox setActiveCheck; - protected JCheckBox isTemplate; + protected JCheckBox isTemplateCheck; // permissions checks protected JCheckBox readPermissionsCheck; @@ -94,8 +94,8 @@ public abstract class ImageMetaDataPageLayout extends WizardPage { grid.add(permissionsGroup, 2, 1).fill(true, false).expand(true, false); grid.nextRow(); // -- end permissions group -- - isTemplate = new JCheckBox("Vorlage erstellen"); - grid.add(isTemplate); + isTemplateCheck = new JCheckBox("Vorlage erstellen"); + grid.add(isTemplateCheck); grid.nextRow(); grid.finish(true); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java index c61b2764..5c4473b7 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java @@ -31,7 +31,6 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout { this.state = uploadWizardState; setPageComplete(false); // HACK set fixed uploadWizardState to test functions - uploadWizardState.isTemplate = false; uploadWizardState.shareMode = ShareMode.LOCAL; // fetch the OS list @@ -77,18 +76,20 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout { reactToUserInput(); } }); - - setActiveCheck.setSelected(state.isEnabled); - } @Override protected void onPageEnter() { LOGGER.debug("Entering page..."); // Preselect OS if possible - if (state.selectedOs == null && state.detectedOs != null) { + if (state.detectedOs != null) { osCombo.setSelectedItem(state.detectedOs); + } else if (state.selectedOs == null) { + osCombo.setSelectedItem(null); } + setActiveCheck.setSelected(state.isEnabled); + isTemplateCheck.setSelected(state.isTemplate); + licencedSoftwareCheck.setSelected(state.isRestricted); } @Override @@ -98,6 +99,9 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout { adminPermissionsCheck.isSelected()); state.selectedOs = (OperatingSystem)osCombo.getSelectedItem(); LOGGER.info("Selected OS is " + state.selectedOs); + state.isEnabled = setActiveCheck.isSelected(); + state.isTemplate = isTemplateCheck.isSelected(); + state.isRestricted = licencedSoftwareCheck.isSelected(); return state.selectedOs != null && state.description != null; } @@ -108,7 +112,6 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout { for (OperatingSystem os : osList) { osCombo.addItem(os); } - // TODO: Select no OS by default } /** @@ -117,14 +120,13 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout { * and call setPageComplete(bool) accordingly. */ private void reactToUserInput() { - if (osCombo.getSelectedIndex() == -1) { // OS empty, description input present setWarningMessage("Wählen Sie das Betriebssystem aus."); setPageComplete(false); return; } - + // evaluate description field state.description = descriptionText.getText(); if (state.description == null || state.description.isEmpty()) { // OS set, no description diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/state/UploadWizardState.java b/dozentenmodul/src/main/java/org/openslx/dozmod/state/UploadWizardState.java index 22dffd88..24894dab 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/state/UploadWizardState.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/state/UploadWizardState.java @@ -24,8 +24,6 @@ public class UploadWizardState { public File descriptionFile = null; // disk file of the virtual machine to be uploaded public File diskFile = null; - // flags an image as a template - public Boolean isTemplate = null; // permissions assigned to that image by the user // TODO: defaults per sat public ImagePermissions permissions = null; @@ -37,6 +35,8 @@ public class UploadWizardState { public boolean isEnabled = true; // resctricted flag public boolean isRestricted = true; + // flags an image as a template + public boolean isTemplate = false; // -- Objects returned by thrift calls -- // UUID given returned by the satellite after creating the image |