summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/gui/lecture/SearchLecture_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/lecture/SearchLecture_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/lecture/SearchLecture_GUI.java')
-rw-r--r--dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
index 8fa8a8e5..39978f3f 100644
--- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
@@ -627,9 +627,16 @@ public class SearchLecture_GUI extends JFrame {
public DefaultTableModel initTableModel(DefaultTableModel model) throws ParseException {
List<server.generated.Lecture> lectures;
try {
+
// Hole eine Liste der erlaubten Images für die diese Person
- //lectures = client.getLectureList();
- lectures = client.getLectureListPermissionRead(person.verantwortlicher.getUserID());
+ if(person.verantwortlicher.getRole()=="Admin"){
+ //get complete list
+ lectures = client.getLectureList();
+ } else {
+ //get permitted list
+ lectures = client.getLectureListPermissionRead(person.verantwortlicher.getUserID());
+ }
+
Iterator<server.generated.Lecture> i = lectures.iterator();
SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");