From 0c249f502fef2b4f6097dd59668a2545dbadccce Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 19 Aug 2015 14:50:01 +0200
Subject: [client] fix all user getting same permissions object in wizard
 custom perms page

---
 .../org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java  | 3 ++-
 .../openslx/dozmod/gui/wizard/page/LectureCustomPermissionPage.java    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'dozentenmodul/src/main/java')

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java
index 852710e6..858f49fc 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java
@@ -4,6 +4,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Map.Entry;
 
 import javax.swing.JOptionPane;
 
@@ -59,7 +60,7 @@ public class ImageCustomPermissionPage extends ImageCustomPermissionPageLayout {
 						if (state.permissions == null) {
 							newUserPerms = new ImagePermissions(false, false, false, false);
 						} else {
-							newUserPerms = state.permissions;
+							newUserPerms = new ImagePermissions(state.permissions);
 						}
 						permissionList.add(new UserImagePermissions(newUser.userId, newUserPerms));
 						LOGGER.debug("User added: " + newUser);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCustomPermissionPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCustomPermissionPage.java
index f19563c2..45c1f05d 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCustomPermissionPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCustomPermissionPage.java
@@ -50,6 +50,7 @@ public class LectureCustomPermissionPage extends LectureCustomPermissionPageLayo
 								return;
 							}
 						}
+						// TODO use default permissions if they exist
 						// add it to the list with either default permissions if set, or none
 						permissionList.add(new UserLecturePermissions(newUser.userId, new LecturePermissions(
 								true, false)));
-- 
cgit v1.2.3-55-g7522