[client] Added confirmation for changing owner of lecture, switched positions of buttons in custom permission windows.

1 files changed, 27 insertions, 25 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java
index 991c934d..2c7e3fb2 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java
@@ -181,7 +181,9 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 					@Override
 					public void userAdded(UserInfo user, UserListWindow window) {
 						window.dispose();
-						setLectureOwner(user);
+						if(Gui.showMessageBox(me, "Sind Sie sicher, dass sie die Besitzerrechte an "
+								+ "einen anderen Account übertragen wollen?", MessageType.QUESTION_YESNO , LOGGER, null))
+							setLectureOwner(user);
 					}
 				}, "Besitzer festlegen", lecture.ownerId);
 			}
@@ -230,18 +232,18 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 	public void setLecture(final String lectureId) {
 		ThriftActions.getLectureAndImageDetails(JOptionPane.getFrameForComponent(me), lectureId,
 				new LectureMetaCallback() {
-					@Override
-					public void fetchedLectureAndImageDetails(LectureRead lectureDetails,
-							ImageDetailsRead imageDetails) {
-						synchronized (me) {
-							lecture = lectureDetails;
-							image = imageDetails;
-							permissionMap = ThriftActions.getLecturePermissions(
-									JOptionPane.getFrameForComponent(me), lecture.lectureId);
-						}
-						fill();
-					}
-				});
+			@Override
+			public void fetchedLectureAndImageDetails(LectureRead lectureDetails,
+					ImageDetailsRead imageDetails) {
+				synchronized (me) {
+					lecture = lectureDetails;
+					image = imageDetails;
+					permissionMap = ThriftActions.getLecturePermissions(
+							JOptionPane.getFrameForComponent(me), lecture.lectureId);
+				}
+				fill();
+			}
+		});
 	}
 
 	/**
@@ -376,18 +378,18 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 		}
 		ThriftActions.initDownload(JOptionPane.getFrameForComponent(this), lecture.imageVersionId,
 				image.imageName, image.virtId, image.osId, versionSize, new DownloadCallback() {
-					@Override
-					public void downloadInitialized(boolean success) {
-						if (!success) {
-							Gui.asyncExec(new Runnable() {
-								@Override
-								public void run() {
-									btnDownloadImage.setEnabled(true);
-								}
-							});
+			@Override
+			public void downloadInitialized(boolean success) {
+				if (!success) {
+					Gui.asyncExec(new Runnable() {
+						@Override
+						public void run() {
+							btnDownloadImage.setEnabled(true);
 						}
-					}
-				});
+					});
+				}
+			}
+		});
 	}
 
 	/**
@@ -576,7 +578,7 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 	 * @param editable true to make fields editable, false otherwise.
 	 */
 	private void makeEditable(boolean editable) {
-		editable = editable && LecturePerms.canEdit(lecture);
+		editable = editable && (LecturePerms.canEdit(lecture) || LecturePerms.canAdmin(lecture));
 		txtTitle.setEditable(editable);
 		txtDescription.setEditable(editable);
 		btnLinkImage.setEnabled(editable);