diff options
author | Jonathan Bauer | 2015-08-27 16:40:52 +0200 |
---|---|---|
committer | Jonathan Bauer | 2015-08-27 16:40:52 +0200 |
commit | 521dfa7d3d1f9efeaa65a7282cb977c96bf12645 (patch) | |
tree | f69d38742f827dca080b0a1dbd086fb1207d2fa0 /dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java | |
parent | [client] filter the table of the columns we dont wanna see when linking an ex... (diff) | |
parent | [client] ColorUtil: Remove unused parameter (diff) | |
download | tutor-module-521dfa7d3d1f9efeaa65a7282cb977c96bf12645.tar.gz tutor-module-521dfa7d3d1f9efeaa65a7282cb977c96bf12645.tar.xz tutor-module-521dfa7d3d1f9efeaa65a7282cb977c96bf12645.zip |
Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java')
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java | 4 |
1 files changed, 2 insertions, 2 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 dcdb938e..e06addc9 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 @@ -143,7 +143,7 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements btnChangeOwner.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - UserListWindow.open(JOptionPane.getFrameForComponent(btnChangeOwner), + UserListWindow.open(me, new UserAddedCallback() { @Override public void userAdded(UserInfo user, UserListWindow window) { @@ -159,7 +159,7 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements LOGGER.info(permissionMap); LOGGER.info(lecture.defaultPermissions); PermissionDefaultToCustomLink<LecturePermissions> pl = LectureCustomPermissionWindow.open( - JOptionPane.getFrameForComponent(me), permissionMap, lecture.defaultPermissions); + me, permissionMap, lecture.defaultPermissions); if (pl != null && pl.defaultPermissions != null && pl.customPermissions != null) { lecture.defaultPermissions = pl.defaultPermissions; permissionMap = pl.customPermissions; |