summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/org
diff options
context:
space:
mode:
authorJonathan Bauer2015-08-19 14:50:01 +0200
committerJonathan Bauer2015-08-19 14:50:01 +0200
commit0c249f502fef2b4f6097dd59668a2545dbadccce (patch)
tree8d258134edccddd28a447057c79c676b48705c2d /dozentenmodul/src/main/java/org
parent[client] move thrift cache to its own package (diff)
downloadtutor-module-0c249f502fef2b4f6097dd59668a2545dbadccce.tar.gz
tutor-module-0c249f502fef2b4f6097dd59668a2545dbadccce.tar.xz
tutor-module-0c249f502fef2b4f6097dd59668a2545dbadccce.zip
[client] fix all user getting same permissions object in wizard custom perms page
Diffstat (limited to 'dozentenmodul/src/main/java/org')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java3
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCustomPermissionPage.java1
2 files changed, 3 insertions, 1 deletions
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)));