diff options
| author | Nino Breuer | 2014-10-15 14:10:11 +0200 |
|---|---|---|
| committer | Nino Breuer | 2014-10-15 14:10:11 +0200 |
| commit | 788c8fbeac35999a0d7308439a00cbbb97c91ac6 (patch) | |
| tree | 8fe0cd0d938043dec601e13b20303696978c07e1 /dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java | |
| parent | added functionality: klick on table header also handles all sub-rights (diff) | |
| parent | [client] Login_GUI: oops, reactivate the Login by pressing Enter on either th... (diff) | |
| download | tutor-module-788c8fbeac35999a0d7308439a00cbbb97c91ac6.tar.gz tutor-module-788c8fbeac35999a0d7308439a00cbbb97c91ac6.tar.xz tutor-module-788c8fbeac35999a0d7308439a00cbbb97c91ac6.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
g
Diffstat (limited to 'dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java index fe49ef06..072ef196 100644 --- a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java +++ b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java @@ -47,6 +47,7 @@ import javax.swing.border.TitledBorder; import models.GUIRights; import models.ImageRights; import models.Links; +import models.RightsManagement; import models.SessionData; import models.person; @@ -132,6 +133,10 @@ public class MainMenue_GUI extends JFrame { txtpnBitteWhlenSie.setBounds(10, 36, 509, 22); panel.add(txtpnBitteWhlenSie); } + + //reset the list of permissions every time the user goes back to the main menu + RightsManagement.rightsManagement.getPermittedUserList().clear(); + contentPanel.setBounds(10, 104, 567, 502); contentPanel.setBackground(SystemColor.menu); |