diff options
| author | Jonathan Bauer | 2016-05-19 16:36:15 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2016-05-19 16:36:15 +0200 |
| commit | e3f6965aedd54eca2af3dd99d254c5e9b5c35465 (patch) | |
| tree | 5db99c80a858666f1906d60d7244c541ac51fa8c /dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java | |
| parent | [client] add search field to the ImagePublishedWindow (diff) | |
| download | tutor-module-e3f6965aedd54eca2af3dd99d254c5e9b5c35465.tar.gz tutor-module-e3f6965aedd54eca2af3dd99d254c5e9b5c35465.tar.xz tutor-module-e3f6965aedd54eca2af3dd99d254c5e9b5c35465.zip | |
[client] published image button states
* always show "public images" button
* hide the "upload to master" button instead of disabling it if the sat doesnt support it
* introduced Session.isImagePublishSupported instead of multiple satApiVersion checks
* added SelectionListener for ImagePublishedWindow to en/disable download buttons on selection change
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java index 892ba65f..66b6a3c5 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java @@ -342,6 +342,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe txtVersion.setEditable(false); txtId.setEditable(false); chkIsTemplate.setEnabled(Session.isSuperUser()); + btnUploadToMaster.setVisible(actionHandler.isImagePublishSupported()); makeEditable(false); // TODO finish ShareMode in server cboShareMode.setEnabled(false); @@ -383,9 +384,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe } }; -// ThriftActions.getImageFullDetails(JOptionPane.getFrameForComponent(me), imageBaseId, callback); actionHandler.getImageDetails(imageBaseId, callback); - //ThriftActions.getImageFullDetails(JOptionPane.getFrameForComponent(me), imageBaseId, callback); } /** @@ -425,7 +424,6 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe */ private void uploadToMaster() { // let the user confirm or abort - // TODO bettar text if (!Gui.showMessageBox("Wollen Sie diese VM wirklich landesweit veröffentlichen?", MessageType.QUESTION_YESNO, LOGGER, null)) return; // start upload to masterserver @@ -729,7 +727,8 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe btnPermissions.setEnabled(editable && ImagePerms.canAdmin(image)); btnChangeOwner.setEnabled(editable && ImagePerms.canAdmin(image)); btnUpdateImage.setEnabled(editable); - btnUploadToMaster.setEnabled(editable && actionHandler.canPublish()); + if (actionHandler.isImagePublishSupported()) + btnUploadToMaster.setEnabled(editable); } /** |