From 1d8ef80202ebaeba26ce7996fb97c226baaa6be8 Mon Sep 17 00:00:00 2001 From: Nino Breuer Date: Wed, 20 May 2015 17:08:08 +0200 Subject: • fixed Bug whereas Lectures weren't editable anymore due to date-parsing error • IdP is stored in config file, default 0. should IdP-Authentication be default now? • Fixed bug: version number was replaced by "unknown".. it is unknown, why that happened :) • Optimized view for additional contacts in images --- .../src/main/java/gui/image/SearchImage_GUI.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java') diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java index be3ca527..282e48ec 100644 --- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java @@ -862,6 +862,7 @@ public class SearchImage_GUI extends JInternalFrame { try { SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); + String additionalContacts = ""; Map res = ThriftManager.getSatClient().getImageData(id, version, SessionData.authToken); labelName.setText(res.get("name")); @@ -893,12 +894,19 @@ public class SearchImage_GUI extends JInternalFrame { List contacts = ThriftManager.getSatClient().getAdditionalImageContacts(id, SessionData.authToken); labelWeitereVerantwortliche.setText(""); - for (int i = 0; i < contacts.size(); i++) { - labelWeitereVerantwortliche.setText(labelWeitereVerantwortliche.getText().trim() - + (contacts.get(i))); + + for(int i = 0; i < contacts.size(); i++) + { + additionalContacts += contacts.get(i); + if(i != contacts.size() -1) + { + additionalContacts += " / "; + } } - labelWeitereVerantwortliche.setToolTipText(labelWeitereVerantwortliche.getText().trim()); + labelWeitereVerantwortliche.setText(additionalContacts); + labelWeitereVerantwortliche.setToolTipText(additionalContacts); + if (person.verantwortlicher.getRole().equals("Student") && res.get("license").equals("1")) { btnDownload.setEnabled(false); } else { -- cgit v1.2.3-55-g7522