[client] Filter for "Usable" now also checks if user canLink the image

removed LINKABLE from FilterTypes

3 files changed, 6 insertions, 16 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java
index 44417cd0..089715dc 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java
@@ -47,14 +47,8 @@ public class ImageListViewer extends QLabel {
 
 	private final RowFilter<ListModel<ImageSummaryRead>, Integer> filterUsable = new RowFilter<ListModel<ImageSummaryRead>, Integer>() {
 		public boolean include(Entry<? extends ListModel<ImageSummaryRead>, ? extends Integer> entry) {
-			return imageTable.getModelRow(entry.getIdentifier()).isValid;
-		}
-	};
-
-	private final RowFilter<ListModel<ImageSummaryRead>, Integer> filterLinkable = new RowFilter<ListModel<ImageSummaryRead>, Integer>() {
-		@Override
-		public boolean include(Entry<? extends ListModel<ImageSummaryRead>, ? extends Integer> entry) {
-			return ImagePerms.canLink(imageTable.getModelRow(entry.getIdentifier())) && imageTable.getModelRow(entry.getIdentifier()).isValid;
+			ImageSummaryRead img = imageTable.getModelRow(entry.getIdentifier());
+			return ImagePerms.canLink(img) && img.isValid;
 		}
 	};
 
@@ -93,9 +87,8 @@ public class ImageListViewer extends QLabel {
 
 	public static enum FilterType {
 		ALL("Alle anzeigen"),
-		OWN("Nur eigene/zugewiesene Anzeigen"),
-		USABLE("Nur verwendbare anzeigen"),
-		LINKABLE("Nur linkbare anzeigen"),
+		OWN("Nur eigene/zugewiesene anzeigen"),
+		USABLE("Nur verwendbare/linkbare anzeigen"),
 		EDITABLE("Nur editierbare anzeigen"),
 		TEMPLATES("Nur Vorlagen zeigen");
 
@@ -204,9 +197,6 @@ public class ImageListViewer extends QLabel {
 		case USABLE:
 			filters.add(filterUsable);
 			break;
-		case LINKABLE:
-			filters.add(filterLinkable);
-			break;
 		case EDITABLE:
 			// filter for editable
 			filters.add(filterEditable);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureChangeLinkedImageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureChangeLinkedImageLayout.java
index 53708dcb..fc8539cf 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureChangeLinkedImageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureChangeLinkedImageLayout.java
@@ -53,7 +53,7 @@ public class LectureChangeLinkedImageLayout extends JDialog {
 		GridManager grid = new GridManager(contentPanel, 1);
 
 		// create the imageListViewer and add it to the pane.
-		imageListViewer = new ImageListViewer(FilterType.LINKABLE);
+		imageListViewer = new ImageListViewer(FilterType.USABLE);
 
 		// Panel for the buttons at the bottom
 		JPanel buttonPane = new JPanel();
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureImageListPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureImageListPageLayout.java
index d7a0ab16..4bef93f9 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureImageListPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureImageListPageLayout.java
@@ -18,7 +18,7 @@ public abstract class LectureImageListPageLayout extends WizardPage {
 		setDescription("Wählen Sie ein Image für diese Veranstaltung aus");
 		GridManager grid = new GridManager(this, 1, false);
 
-		imageListViewer = new ImageListViewer(FilterType.LINKABLE);
+		imageListViewer = new ImageListViewer(FilterType.USABLE);
 		grid.add(imageListViewer).fill(true, true).expand(true, true);
 		grid.finish(false);
 	}