diff options
Diffstat (limited to 'dozentenmodul/src/main/java/org')
4 files changed, 7 insertions, 7 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImageTable.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImageTable.java index 508457b5..d692d92f 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImageTable.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImageTable.java @@ -30,9 +30,9 @@ public class ImageTable extends ListTable<ImageSummaryRead> { if (columnIndex == 3) return FormatHelper.longDate(row.getUpdateTime()); if (columnIndex == 4) - return row.getCurrentVersionId() == null ? "-" : FormatHelper.bytes(row.getFileSize(), false); + return row.getLatestVersionId() == null ? "-" : FormatHelper.bytes(row.getFileSize(), false); if (columnIndex == 5) - return row.getCurrentVersionId() == null ? "-" : row.getCurrentVersionId(); + return row.getLatestVersionId() == null ? "-" : row.getLatestVersionId(); if (columnIndex == 6) return row.isTemplate; throw new IndexOutOfBoundsException(); 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 05e1df76..babd4e41 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 @@ -110,7 +110,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout { lblCreateTime.setText(FormatHelper.longDate(image.getCreateTime())); lblUpdateTime.setText(FormatHelper.longDate(image.getUpdateTime())); txtId.setText(image.getImageBaseId()); - txtVersion.setText(image.getCurrentVersionId()); + txtVersion.setText(image.getLatestVersionId()); List<OperatingSystem> osList = MetaDataCache.getOperatingSystems(); 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 5ce4551a..684540c9 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 @@ -100,11 +100,11 @@ public class ImageListWindow extends ImageListWindowLayout { final ImageSummaryRead image = getSelectedImage(); if (image == null) return; // check if we have a version - if (image.isSetCurrentVersionId()) { + if (image.isSetLatestVersionId()) { // try to actually delete this version of the image try { - ThriftManager.getSatClient().deleteImageVersion(Session.getSatelliteToken(), image.getCurrentVersionId()); - LOGGER.info("Deleted version '" + image.getCurrentVersionId() + "' of image '" + image.getImageBaseId() + "'."); + ThriftManager.getSatClient().deleteImageVersion(Session.getSatelliteToken(), image.getLatestVersionId()); + LOGGER.info("Deleted version '" + image.getLatestVersionId() + "' of image '" + image.getImageBaseId() + "'."); refreshList(true); } catch (TAuthorizationException e) { Gui.showMessageBox(me, "Sie sind nicht autorisiert dieses Image zu löschen!", MessageType.ERROR, LOGGER, e); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageWizard.java index 98fd8287..8d1f046c 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageWizard.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageWizard.java @@ -86,7 +86,7 @@ public class ImageWizard extends Wizard { // push to sat ThriftManager.getSatClient().updateImageVersion(Session.getSatelliteToken(), uploadWizardState.transferInformation.getToken(), - new ImageVersionWrite(uploadWizardState.isEnabled, uploadWizardState.isRestricted)); + new ImageVersionWrite(uploadWizardState.isRestricted)); } catch (TException e) { Gui.showMessageBox(this, "Could not set active/restricted flags to satellite: ", MessageType.ERROR, LOGGER, e); |