diff options
| author | Nino Breuer | 2014-10-15 14:10:11 +0200 |
|---|---|---|
| committer | Nino Breuer | 2014-10-15 14:10:11 +0200 |
| commit | 788c8fbeac35999a0d7308439a00cbbb97c91ac6 (patch) | |
| tree | 8fe0cd0d938043dec601e13b20303696978c07e1 /dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java | |
| parent | added functionality: klick on table header also handles all sub-rights (diff) | |
| parent | [client] Login_GUI: oops, reactivate the Login by pressing Enter on either th... (diff) | |
| download | tutor-module-788c8fbeac35999a0d7308439a00cbbb97c91ac6.tar.gz tutor-module-788c8fbeac35999a0d7308439a00cbbb97c91ac6.tar.xz tutor-module-788c8fbeac35999a0d7308439a00cbbb97c91ac6.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
g
Diffstat (limited to 'dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java | 10 |
1 files changed, 7 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 f295a1c4..e92b04b0 100644 --- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java @@ -98,6 +98,7 @@ public class SearchEditImage_GUI extends JFrame { boolean activeSearch = false; private JTextField textFieldName; Component c = null; + int requiredPermission = 1; // 0=Read, 1= Write, 2=LinkAllowed, 3=Admin String[] titles = { "Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "ID", "Version", "Template" };// Angezeigt // werden @@ -108,6 +109,7 @@ public class SearchEditImage_GUI extends JFrame { // Verantwortlicher (4), // Letztes // Update (5) + private static final String HELP_MESSAGE = "<html><div align=\"center\">" + "Suchen Sie Images und laden Sie sie direkt herunter.<br />" + "Sie können die Volltextsuche nutzen und nach Betriebssystemen filtern.<br />" + @@ -890,8 +892,10 @@ public class SearchEditImage_GUI extends JFrame { public DefaultTableModel initTableModel(DefaultTableModel model) { List<server.generated.Image> images; try { - // Hole eine Liste der Images - images = client.getImageList(); + // Hole eine Liste der passenden Images + images = client.getImageListPermissionWrite(person.verantwortlicher.getUserID()); + System.out.println("User is: "+person.verantwortlicher.getUserID()); + //images = client.getImageList(person.verantwortlicher.getUserID(), requiredPermission); Iterator<server.generated.Image> i = images.iterator(); SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -937,7 +941,7 @@ public class SearchEditImage_GUI extends JFrame { labelName.setText(res.get("name")); labelOS.setText(res.get("os")); labelUpdate.setText(out.format(in.parse(res.get("lastupdate")))); - labelVerantwortlicher.setText(res.get("owner")); + labelVerantwortlicher.setText(res.get("owner") + " (" + res.get("mail") + ")"); labelWeitereVerantwortliche.setText("Noch nicht Verfügbar"); if (res.get("template").equals("true")) { labelVorlage.setText("Ja"); |