diff options
3 files changed, 5 insertions, 12 deletions
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 319499f1..e739813f 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 @@ -278,12 +278,13 @@ public class ImageListWindow extends ImageListWindowLayout implements DownloadCa popupItemDelete.setEnabled(delete); btnEditDetails.setEnabled(selCount == 1); - if (Session.isStudent()) + if (!Session.canListImages()) { deactiveUnnecessaryButtonsForStudents(); } else { btnShowPublishedImages.setEnabled(true); } + } public void refresh(boolean force) { @@ -446,7 +447,7 @@ public class ImageListWindow extends ImageListWindowLayout implements DownloadCa // we need to enable the "Show published images" button here, since we need to check // Session.getSatApiVersion() which is not set when this class is instantiated ctlImageListViewer.refreshList(false, 1); - if(Session.isStudent()) + if(!Session.canListImages()) { btnShowPublishedImages.setVisible(false); } else { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java index a3bc0d6b..d6adfc5e 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java @@ -473,7 +473,7 @@ public class LectureListWindow extends LectureListWindowLayout { updateAvailableOptions(null); refreshList(false); - if (Session.isStudent()) + if (!Session.canListImages()) { deactiveUnnecessaryButtonsForStudents(); } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/Session.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/Session.java index 8934620f..46771d46 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/Session.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/Session.java @@ -83,15 +83,7 @@ public class Session { return null; return data.user.userId; } - /** - * @return checks if user is Student - */ - public static boolean isStudent() { - if (data == null) - return false; - return data.user.role == Role.STUDENT; - } - + /** * @return the organization id */ |