diff options
| author | Michael Wilson | 2014-11-24 16:32:22 +0100 |
|---|---|---|
| committer | Michael Wilson | 2014-11-24 16:32:22 +0100 |
| commit | 825db01db2f2016d9458dcde4a79a9e664b46d54 (patch) | |
| tree | 5375399bf7bddcb27c4bd29ccda503167ee9414a /dozentenmodul/src/main/java/gui/image | |
| parent | • corrected typo (diff) | |
| download | tutor-module-825db01db2f2016d9458dcde4a79a9e664b46d54.tar.gz tutor-module-825db01db2f2016d9458dcde4a79a9e664b46d54.tar.xz tutor-module-825db01db2f2016d9458dcde4a79a9e664b46d54.zip | |
• role admin can now always call the permission page
Diffstat (limited to 'dozentenmodul/src/main/java/gui/image')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java | 2 | ||||
| -rw-r--r-- | dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java index f9701a0c..5ecda8d7 100644 --- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java @@ -355,7 +355,7 @@ public class EditImageTechnisch_GUI extends JFrame { try { //check if user may change permissions and choose window - if(client.userIsImageAdmin(person.verantwortlicher.getUserID(),Image.image.getImageId()) == true){ + if( (client.userIsImageAdmin(person.verantwortlicher.getUserID(),Image.image.getImageId()) == true) || (person.verantwortlicher.getRole().equals("Admin")) ){ //user has permission, go to permission GUI PermissionEditImage_GUI ea=new PermissionEditImage_GUI(c); ea.setVisible(true); diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java index 415e3dee..937479a9 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java @@ -455,7 +455,7 @@ public class FTPEditUploader_GUI extends JFrame implements // not loading files, go back one page try { - if(client.userIsImageAdmin(person.verantwortlicher.getUserID(), Image.image.getImageId()) == true){ + if( (client.userIsImageAdmin(person.verantwortlicher.getUserID(), Image.image.getImageId()) == true) || person.verantwortlicher.getRole().equals("Admin") ){ //user is admin and may change permissions PermissionEditImage_GUI ei = new PermissionEditImage_GUI(c); ei.setVisible(true); |