summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
diff options
context:
space:
mode:
authorMichael Wilson2014-11-20 19:10:04 +0100
committerMichael Wilson2014-11-20 19:10:04 +0100
commit01ec4d567964101bc7a732ae92e059698b615817 (patch)
treea81a1fee7ab28fbf50ff01bdb54c9b136bd8dded /dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
parentMerge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff)
downloadtutor-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/SearchImage_GUI.java')
-rw-r--r--dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
index 19900dba..f144489d 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
@@ -1017,8 +1017,14 @@ public class SearchImage_GUI extends JFrame {
public DefaultTableModel initTableModel(DefaultTableModel model) {
List<server.generated.Image> images;
try {
+
// Hole eine Liste der Images
- images = client.getImageListPermissionRead(person.verantwortlicher.getUserID());
+ if(person.verantwortlicher.getRole()=="Admin"){
+ //get complete list
+ images = client.getImageList(person.verantwortlicher.getUserID());
+ } else {
+ images = client.getImageListPermissionRead(person.verantwortlicher.getUserID());
+ }
Iterator<server.generated.Image> i = images.iterator();
SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");