diff options
| author | Michael Wilson | 2014-11-20 19:10:04 +0100 |
|---|---|---|
| committer | Michael Wilson | 2014-11-20 19:10:04 +0100 |
| commit | 01ec4d567964101bc7a732ae92e059698b615817 (patch) | |
| tree | a81a1fee7ab28fbf50ff01bdb54c9b136bd8dded /dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java | |
| parent | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff) | |
| download | tutor-module-01ec4d567964101bc7a732ae92e059698b615817.tar.gz tutor-module-01ec4d567964101bc7a732ae92e059698b615817.tar.xz tutor-module-01ec4d567964101bc7a732ae92e059698b615817.zip | |
Lists now have the functionality to show complete lists, when role=="Admin"
Diffstat (limited to 'dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java index 115d6083..983b62b1 100644 --- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java @@ -754,9 +754,15 @@ public class SearchEditImage_GUI extends JFrame { List<server.generated.Image> images; try { - // Hole eine Liste der passenden Images - images = client.getImageListPermissionWrite(person.verantwortlicher - .getUserID()); + + // Hole eine Liste der passenden Images, + if(person.verantwortlicher.getRole()=="Admin"){ + //get complete list + images = client.getImageList(person.verantwortlicher.getUserID()); + } else { + //only get permitted list + images = client.getImageListPermissionWrite(person.verantwortlicher.getUserID()); + } Iterator<server.generated.Image> i = images.iterator(); SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |