diff options
Diffstat (limited to 'dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java | 69 |
1 files changed, 34 insertions, 35 deletions
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java index 1633cb15..001f1b44 100644 --- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java @@ -150,16 +150,16 @@ public class EditLectureLink_GUI extends JFrame { */ public EditLectureLink_GUI(Component formerGUI) { - try { - client.setTokenForSession(SessionData.session.getAuthToken()); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } con.closeThriftConnection(); System.exit(0); } @@ -415,7 +415,7 @@ public class EditLectureLink_GUI extends JFrame { comboBox = new JComboBox<String>(); try { - List<String> list = client.getAllOS(); + List<String> list = client.getAllOS(SessionData.session.getAuthToken()); comboBox.addItem(""); for (int i = 0; i < list.size(); i++) { comboBox.addItem(list.get(i)); @@ -629,7 +629,9 @@ public class EditLectureLink_GUI extends JFrame { //check which GUI to open try { - if( (client.userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid())==true) || (person.verantwortlicher.getRole().equals("Admin")) ){ + + if(client.userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid(),SessionData.session.getAuthToken()) || (person.verantwortlicher.getRole().equals("Admin"))){ + //user is admin of the lecture PermissionEditLecture_GUI ev = new PermissionEditLecture_GUI(c); ev.setVisible(true); @@ -691,19 +693,17 @@ public class EditLectureLink_GUI extends JFrame { .convertRowIndexToModel(tablemyImages .getSelectedRow()), 7).toString(), - person.verantwortlicher.getUsername(), - person.verantwortlicher.getVorname(), - person.verantwortlicher.getName(), - person.verantwortlicher.getHochschule(), - person.verantwortlicher.getEMail(), + SessionData.session.getAuthToken(), person.verantwortlicher.getTel(), person.verantwortlicher.getFakultaet(), - Lecture.lecture.getid()); + Lecture.lecture.getid(), + person.verantwortlicher.getHochschule()); // remove all additional user permissions on // first stage client.deleteAllAdditionalLecturePermissions( Lecture.lecture.getid(), + SessionData.session.getAuthToken(), person.verantwortlicher.getUserID()); // then, add user permissions as they have been @@ -740,7 +740,8 @@ public class EditLectureLink_GUI extends JFrame { .get(i).isLecture_write(),// write RightsManagement.rightsManagement .getPermittedUserList() - .get(i).isLecture_admin()// admin + .get(i).isLecture_admin(),// admin + SessionData.session.getAuthToken() ); }// end for @@ -809,19 +810,17 @@ public class EditLectureLink_GUI extends JFrame { .convertRowIndexToModel(tablePublicVorlagen .getSelectedRow()), 7).toString(), - person.verantwortlicher.getUsername(), - person.verantwortlicher.getVorname(), - person.verantwortlicher.getName(), - person.verantwortlicher.getHochschule(), - person.verantwortlicher.getEMail(), + SessionData.session.getAuthToken(), person.verantwortlicher.getTel(), person.verantwortlicher.getFakultaet(), - Lecture.lecture.getid()); + Lecture.lecture.getid(), + person.verantwortlicher.getHochschule()); // remove all additional user permissions on // first stage client.deleteAllAdditionalLecturePermissions( Lecture.lecture.getid(), + SessionData.session.getAuthToken(), person.verantwortlicher.getUserID()); // then, add user permissions as they have been @@ -852,7 +851,8 @@ public class EditLectureLink_GUI extends JFrame { .get(i).isImageWrite(),// write RightsManagement.rightsManagement .getPermittedUserList() - .get(i).isImageAdmin()// admin + .get(i).isImageAdmin(),// admin + SessionData.session.getAuthToken() ); } @@ -917,19 +917,17 @@ public class EditLectureLink_GUI extends JFrame { .convertRowIndexToModel(tableAllImages .getSelectedRow()), 7).toString(), - person.verantwortlicher.getUsername(), - person.verantwortlicher.getVorname(), - person.verantwortlicher.getName(), - person.verantwortlicher.getHochschule(), - person.verantwortlicher.getEMail(), + SessionData.session.getAuthToken(), person.verantwortlicher.getTel(), person.verantwortlicher.getFakultaet(), - Lecture.lecture.getid()); + Lecture.lecture.getid(), + person.verantwortlicher.getHochschule()); // remove all additional user permissions on // first stage client.deleteAllAdditionalLecturePermissions( Lecture.lecture.getid(), + SessionData.session.getAuthToken(), person.verantwortlicher.getUserID()); // then, add user permissions as they have been @@ -960,7 +958,8 @@ public class EditLectureLink_GUI extends JFrame { .get(i).isImageWrite(),// write RightsManagement.rightsManagement .getPermittedUserList() - .get(i).isImageAdmin()// admin + .get(i).isImageAdmin(),// admin + SessionData.session.getAuthToken() ); } @@ -1220,11 +1219,11 @@ public class EditLectureLink_GUI extends JFrame { // Hole eine Liste der Images if(person.verantwortlicher.getRole()=="Admin"){ //get complete list - images = client.getImageList(person.verantwortlicher.getUserID()); + images = client.getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken()); } else { //get permitted list images = client.getImageListPermissionLink(person.verantwortlicher - .getUserID()); + .getUserID(),SessionData.session.getAuthToken()); } Iterator<server.generated.Image> i = images.iterator(); @@ -1263,11 +1262,11 @@ public class EditLectureLink_GUI extends JFrame { // Hole eine Liste der Images if(person.verantwortlicher.getRole()=="Admin"){ //get complete list - images = client.getImageList(person.verantwortlicher.getUserID()); + images = client.getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken()); } else { //get permitted list images = client.getImageListPermissionLink(person.verantwortlicher - .getUserID()); + .getUserID(),SessionData.session.getAuthToken()); } Iterator<server.generated.Image> i = images.iterator(); @@ -1306,7 +1305,7 @@ public class EditLectureLink_GUI extends JFrame { // Hole eine Liste der Images //images = client.getImageListPermissionLink(person.verantwortlicher.getUserID()); - images = client.getImageListAllTemplates(); + images = client.getImageListAllTemplates(SessionData.session.getAuthToken()); Iterator<server.generated.Image> i = images.iterator(); SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -1360,7 +1359,7 @@ public class EditLectureLink_GUI extends JFrame { try { SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); - Map<String, String> res = client.getImageData(id, version); + Map<String, String> res = client.getImageData(id, version,SessionData.session.getAuthToken()); labelName.setText(res.get("name")); labelOS.setText(res.get("os")); labelUpdate.setText(out.format(in.parse(res.get("lastupdate")))); |
