diff options
| author | Nino Breuer | 2014-11-03 09:17:29 +0100 |
|---|---|---|
| committer | Nino Breuer | 2014-11-03 09:17:29 +0100 |
| commit | 4a078e9847b348441fdd7a36b558e107a7280ff0 (patch) | |
| tree | 8ad894376343bd00b46bceb113ace5ce1e02737c /dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java | |
| parent | v (diff) | |
| parent | • fixed bug which caused search guis to be closed when pressing enter in se... (diff) | |
| download | tutor-module-4a078e9847b348441fdd7a36b558e107a7280ff0.tar.gz tutor-module-4a078e9847b348441fdd7a36b558e107a7280ff0.tar.xz tutor-module-4a078e9847b348441fdd7a36b558e107a7280ff0.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
dozentenmodulserver/src/main/java/sql/SQL.java
• Note: manual merge
Diffstat (limited to 'dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java index fd95bd8d..b54e139a 100644 --- a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java +++ b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java @@ -141,6 +141,9 @@ public class MainMenue_GUI extends JFrame { //reset the list of permissions every time the user goes back to the main menu RightsManagement.rightsManagement.getPermittedUserList().clear(); + //reset model + Image.image.reset(); + //Lecture.lecture.reset(); contentPanel.setBounds(10, 104, 567, 502); @@ -594,12 +597,12 @@ public class MainMenue_GUI extends JFrame { }// end if else // always print rights information - LOGGER.info("Rights: (r, w, cp, a, la) = (" - + GUIRights.rights.getRead() + ", " - + GUIRights.rights.getWrite() + ", " - + GUIRights.rights.getChangePermission() + ", " - + GUIRights.rights.getAdmin() + ", " - + GUIRights.rights.getLinkAllowed() + ")"); + //LOGGER.info("Rights: (r, w, cp, a, la) = (" + // + GUIRights.rights.getRead() + ", " + // + GUIRights.rights.getWrite() + ", " + // + GUIRights.rights.getChangePermission() + ", " + // + GUIRights.rights.getAdmin() + ", " + // + GUIRights.rights.getLinkAllowed() + ")"); }// end setRoleRights public void setCorrectRadioButton() { |