diff options
| author | Nino Breuer | 2014-10-28 20:03:48 +0100 |
|---|---|---|
| committer | Nino Breuer | 2014-10-28 20:03:48 +0100 |
| commit | 27f8ecc87220d588ff889e7be1ba5ec419a942ba (patch) | |
| tree | 0e79413dc22c3eb857e88ee833c8329baff0b901 /dozentenmodul/src/main/java/models | |
| parent | changed implementation of full text search in some classes (diff) | |
| parent | Serverseitiges Read und Write von Rechten korrigiert (diff) | |
| download | tutor-module-27f8ecc87220d588ff889e7be1ba5ec419a942ba.tar.gz tutor-module-27f8ecc87220d588ff889e7be1ba5ec419a942ba.tar.xz tutor-module-27f8ecc87220d588ff889e7be1ba5ec419a942ba.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
Diffstat (limited to 'dozentenmodul/src/main/java/models')
| -rw-r--r-- | dozentenmodul/src/main/java/models/person.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/dozentenmodul/src/main/java/models/person.java b/dozentenmodul/src/main/java/models/person.java index c786598c..4ad5bb3d 100644 --- a/dozentenmodul/src/main/java/models/person.java +++ b/dozentenmodul/src/main/java/models/person.java @@ -10,11 +10,10 @@ public class person { private String EMail; private String Tel; private String Fakultaet; - private boolean ischecked; private String role; + private boolean ischecked; private boolean image_read; private boolean image_write; - // private boolean changePermission; private boolean image_admin; private boolean image_linkAllowed; private boolean lecture_read; |