summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java
diff options
context:
space:
mode:
authorSimon Rettberg2018-06-25 11:49:49 +0200
committerSimon Rettberg2018-06-25 11:49:49 +0200
commitadd20da4ed7e68584497b7751d827b9435d55610 (patch)
tree34790a26b85546ec24aac6c8a6fdd2f0802bb5f6 /dozentenmodul/src/main/java
parent[client] Move netrules configurator into tab (diff)
downloadtutor-module-add20da4ed7e68584497b7751d827b9435d55610.tar.gz
tutor-module-add20da4ed7e68584497b7751d827b9435d55610.tar.xz
tutor-module-add20da4ed7e68584497b7751d827b9435d55610.zip
[client] Fix change detection for lecture permissions
Diffstat (limited to 'dozentenmodul/src/main/java')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LecturePermissionConfigurator.java14
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java7
2 files changed, 6 insertions, 15 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LecturePermissionConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LecturePermissionConfigurator.java
index b99df3f2..26052cf3 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LecturePermissionConfigurator.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LecturePermissionConfigurator.java
@@ -177,24 +177,12 @@ public class LecturePermissionConfigurator extends JPanel {
Map<String, LecturePermissions> newPermissionMap = new HashMap<>(permissionList.size());
// put permissions of the list into the map
for (UserLecturePermissions perm : permissionList) {
- newPermissionMap.put(perm.userId, perm.permissions);
+ newPermissionMap.put(perm.userId, new LecturePermissions(perm.permissions));
}
return newPermissionMap;
}
/**
- * Update the default permissions used by the manager.
- *
- * @param admin
- * @param edit
- */
- public void updateDefaultPermissions(boolean admin, boolean edit) {
- defaultPermissions.admin = admin;
- defaultPermissions.edit = edit;
- }
-
-
- /**
* Custom event mechanism to detect changes to the user list
* (Mostly needed for the reactToChange() stuff in LectureDetailsWindow)
*/
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 92abe8bf..c2c1f1d9 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
@@ -244,8 +244,11 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
final ItemListener updateDefaultPermissionListener = new ItemListener() {
@Override
public void itemStateChanged(ItemEvent e) {
- ctlPermissionManager.updateDefaultPermissions(chkCustomPermAdmin.isSelected(),
- chkCustomPermEdit.isSelected());
+ if (e.getSource() == chkCustomPermAdmin) {
+ lecture.defaultPermissions.admin = chkCustomPermAdmin.isSelected();
+ } else {
+ lecture.defaultPermissions.edit = chkCustomPermEdit.isSelected();
+ }
}
};
chkCustomPermAdmin.addItemListener(updateDefaultPermissionListener);