[client] publish image stuff 2.0

1 files changed, 9 insertions, 3 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 3d4b7d0d..7d7a813e 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
@@ -77,7 +77,12 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 	 * Self-reference
 	 */
 	private final ImageDetailsWindow me = this;
+	
+	/**
+	 * Action handler proxying thrift calls to differentiate between local and published image mode
+	 */
 	private final ImageDetailsActions actionHandler;
+
 	/**
 	 * Callback interface to refresh image list after changing image details
 	 */
@@ -379,7 +384,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 		};
 
 //		ThriftActions.getImageFullDetails(JOptionPane.getFrameForComponent(me), imageBaseId, callback);
-		actionHandler.getImageDetails(JOptionPane.getFrameForComponent(me), imageBaseId, callback);
+		actionHandler.getImageDetails(imageBaseId, callback);
 		//ThriftActions.getImageFullDetails(JOptionPane.getFrameForComponent(me), imageBaseId, callback);
 	}
 
@@ -389,7 +394,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 	 * @param user UserInfo to set the owner to
 	 */
 	private void setImageOwner(final UserInfo user) {
-		if (!actionHandler.setImageOwner(JOptionPane.getFrameForComponent(me), image.getImageBaseId(), user)) {
+		if (!actionHandler.setImageOwner(image.getImageBaseId(), user)) {
 			return;
 		}
 		Gui.showMessageBox(me, "Besitzrechte übertragen an " + FormatHelper.userName(user), MessageType.INFO,
@@ -519,7 +524,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 	private void deleteVersion(final ImageVersionDetails version) {
 		if (version == null)
 			return;
-		actionHandler.deleteImageVersion(JOptionPane.getFrameForComponent(this), version,
+		actionHandler.deleteImageVersion(version,
 				new DeleteCallback() {
 					@Override
 					public void isDeleted(boolean success) {
@@ -716,6 +721,7 @@ 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());
 	}
 
 	/**