diff options
author | Simon Rettberg | 2018-12-11 10:47:17 +0100 |
---|---|---|
committer | Simon Rettberg | 2018-12-11 10:47:17 +0100 |
commit | ee74f04fe01b32cdd5a859730a78f19e7e01a938 (patch) | |
tree | ec9f667f44ddf3c5051ce510b55a1ebc9714572d /dozentenmodul/src/main/java/org/openslx/dozmod/gui/window | |
parent | [*] Follow changes in m-s-s to load/save predef netshare/filters (diff) | |
download | tutor-module-ee74f04fe01b32cdd5a859730a78f19e7e01a938.tar.gz tutor-module-ee74f04fe01b32cdd5a859730a78f19e7e01a938.tar.xz tutor-module-ee74f04fe01b32cdd5a859730a78f19e7e01a938.zip |
Revert "[client] Get rid of Feature checks; RPC version was bumped"
This reverts commit b9f993161d7a8472e82f2c747c2361a3ba411b6a.
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/window')
3 files changed, 21 insertions, 11 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 241656f6..1dacf8df 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 @@ -66,6 +66,7 @@ import org.openslx.dozmod.thrift.cache.MetaDataCache; import org.openslx.dozmod.thrift.cache.UserCache; import org.openslx.dozmod.util.DesktopEnvironment; import org.openslx.dozmod.util.FormatHelper; +import org.openslx.sat.thrift.version.Feature; import org.openslx.thrifthelper.Comparators; import org.openslx.thrifthelper.TConst; import org.openslx.thrifthelper.ThriftManager; @@ -324,7 +325,8 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe && ImagePerms.canEdit(image) && (image.shareMode == ShareMode.LOCAL || image.shareMode == ShareMode.PUBLISH)); mnuDelete.setEnabled(ImagePerms.canEdit(image)); - mnuExtendExpiryDate.setEnabled(!multiSelection && selectedVersion.isValid); + mnuExtendExpiryDate.setEnabled(!multiSelection && (selectedVersion.isValid + || Session.hasFeature(Feature.EXTEND_EXPIRED_VM))); pop.show(e.getComponent(), e.getX(), e.getY()); } } @@ -491,8 +493,8 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe * masterserver. */ private void uploadToMaster() { - // TODO 04.2018: bail if we the user tries to publish a non-vmware image. - if (!TConst.VIRT_VMWARE.equals(image.virtId)) { + // 04.2018: bail if we the user tries to publish a non-vmware image. + if (Session.hasFeature(Feature.MULTIPLE_HYPERVISORS) && !TConst.VIRT_VMWARE.equals(image.virtId)) { Gui.showMessageBox( MetaDataCache.getVirtualizerById(image.virtId).virtName + " ist derzeit nicht für den öffentlichen Austausch freigegeben.", diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePublishedWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePublishedWindow.java index 117ca324..c81af1a6 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePublishedWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePublishedWindow.java @@ -42,6 +42,7 @@ import org.openslx.dozmod.thrift.ThriftError; import org.openslx.dozmod.thrift.cache.ImagePublishedCache; import org.openslx.dozmod.thrift.cache.OrganizationCache; import org.openslx.dozmod.thrift.cache.UserCache; +import org.openslx.sat.thrift.version.Feature; import org.openslx.thrifthelper.TConst; import org.openslx.thrifthelper.ThriftManager; import org.openslx.util.QuickTimer; @@ -253,14 +254,16 @@ public class ImagePublishedWindow extends ImagePublishedWindowLayout implements final List<ImageSummaryRead> imagePublishedList = ImagePublishedCache.get(forceRefresh); if (imagePublishedList == null) return; - // TODO 04.2018: Safety check to hide the non-vmware images from the list + // 04.2018: Safety check to hide the non-vmware images from the list // in case they somehow manage to get published. Remove this when we // support publishing images from other hypervisors. - for (Iterator<ImageSummaryRead> iter = imagePublishedList.listIterator(); iter - .hasNext();) { - ImageSummaryRead current = iter.next(); - if (current != null && !current.virtId.equals(TConst.VIRT_VMWARE)) { - iter.remove(); + if (Session.hasFeature(Feature.MULTIPLE_HYPERVISORS)) { + for (Iterator<ImageSummaryRead> iter = imagePublishedList.listIterator(); iter + .hasNext();) { + ImageSummaryRead current = iter.next(); + if (current != null && !current.virtId.equals(TConst.VIRT_VMWARE)) { + iter.remove(); + } } } Gui.asyncExec(new Runnable() { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java index dd049c79..4eae542c 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java @@ -43,6 +43,7 @@ import org.openslx.dozmod.gui.helper.GridManager; import org.openslx.dozmod.thrift.Session; import org.openslx.dozmod.thrift.cache.MetaDataCache; import org.openslx.dozmod.util.FormatHelper; +import org.openslx.sat.thrift.version.Feature; import org.openslx.thrifthelper.Comparators; @SuppressWarnings("serial") @@ -407,8 +408,12 @@ public abstract class LectureDetailsWindowLayout extends JDialog { pnlTabs.addTab("VM-Start", pnlTabRunscript); } pnlTabs.addTab("Berechtigungen", pnlTabPermissions); - pnlTabs.addTab("Netzlaufwerke", pnlTabNetshare); - pnlTabs.addTab("LDAP-Filter", pnlTabLdapFilter); + if (Session.hasFeature(Feature.NETWORK_SHARES)) { + pnlTabs.addTab("Netzlaufwerke", pnlTabNetshare); + } + if (Session.hasFeature(Feature.LECTURE_FILTER_LDAP)) { + pnlTabs.addTab("LDAP-Filter", pnlTabLdapFilter); + } add(pnlTabs, BorderLayout.CENTER); // usage counter + button panel on the bottom JPanel buttonPanel = new JPanel(); |