diff options
| author | Nino Breuer | 2014-10-29 14:01:34 +0100 |
|---|---|---|
| committer | Nino Breuer | 2014-10-29 14:01:34 +0100 |
| commit | 4ea470cca06090304bc1cf419251b1bc5e5adaab (patch) | |
| tree | 85ba400ebdd3a0de607c20788e4d74567540d1f6 /dozentenmodul/src/main/java/gui/image | |
| parent | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff) | |
| parent | Ausgaben etwas verkürzt (diff) | |
| download | tutor-module-4ea470cca06090304bc1cf419251b1bc5e5adaab.tar.gz tutor-module-4ea470cca06090304bc1cf419251b1bc5e5adaab.tar.xz tutor-module-4ea470cca06090304bc1cf419251b1bc5e5adaab.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Diffstat (limited to 'dozentenmodul/src/main/java/gui/image')
4 files changed, 13 insertions, 3 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java index 974ab860..22344d2f 100644 --- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java @@ -755,7 +755,7 @@ public class DeleteImage_GUI extends JFrame { List<server.generated.Image> images; try { // Hole eine Liste der Images - images = client.getImageListPermissionWrite(person.verantwortlicher.getUserID()); + images = client.getImageListPermissionAdmin(person.verantwortlicher.getUserID()); Iterator<server.generated.Image> i = images.iterator(); diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java index b222b7ed..8db64f4f 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java @@ -697,6 +697,16 @@ public class FTPCreateUploader_GUI extends JFrame implements RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageLinkAllowed(), RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageAdmin() ); + /* + LOGGER.info( + "Name: "+Image.image.getImagename() + +"\tUserID: "+RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID() + +"\tisImageRead: "+RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageRead() + +"\tisImageWrite: "+RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageWrite() + +"\tisImageLInkAllowed: "+RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageLinkAllowed() + +"\tisImageAdmin: "+RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageAdmin() + ); + */ }//end for diff --git a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java index 736530de..70fd2025 100644 --- a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java @@ -577,7 +577,7 @@ public class PermissionCreateImage_GUI extends JFrame { isLink = (boolean) table.getValueAt(selectedRow, 3); isAdmin = (boolean) table.getValueAt(selectedRow, 4); - boolean[] checkedVals = CheckIntegrity.isIntegre(isRead, isWrite, + boolean[] checkedVals = CheckIntegrity.isIntegreForImage(isRead, isWrite, isLink, isAdmin); table.setValueAt(checkedVals[0], selectedRow, 1); diff --git a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java index 8de41289..c80d5a52 100644 --- a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java @@ -634,7 +634,7 @@ public class PermissionEditImage_GUI extends JFrame { isLink = (boolean) table.getValueAt(selectedRow, 3); isAdmin = (boolean) table.getValueAt(selectedRow, 4); - boolean[] checkedVals = CheckIntegrity.isIntegre(isRead, isWrite, + boolean[] checkedVals = CheckIntegrity.isIntegreForImage(isRead, isWrite, isLink, isAdmin); table.setValueAt(checkedVals[0], selectedRow, 1); |