diff options
| author | Michael Wilson | 2014-10-13 17:00:22 +0200 |
|---|---|---|
| committer | Michael Wilson | 2014-10-13 17:00:22 +0200 |
| commit | 64c2bf490691b0d86f939bc1a15f64b66884d41f (patch) | |
| tree | cea6bda5506b2f148d4561d0f8c832fe75cfd3e4 /dozentenmodul/src/main/java/gui | |
| parent | vorbereitung rechte korrigieren (diff) | |
| download | tutor-module-64c2bf490691b0d86f939bc1a15f64b66884d41f.tar.gz tutor-module-64c2bf490691b0d86f939bc1a15f64b66884d41f.tar.xz tutor-module-64c2bf490691b0d86f939bc1a15f64b66884d41f.zip | |
Rechteverwaltung weiter umgesetzt:
-Alle Instanzen von Listen der Images sind nun auf die Rechte des eingeloggten Benutzers beschränkt
Diffstat (limited to 'dozentenmodul/src/main/java/gui')
5 files changed, 10 insertions, 6 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java index 595a97d0..54dda92b 100644 --- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java @@ -906,7 +906,7 @@ public class DeleteImage_GUI extends JFrame { List<server.generated.Image> images; try { // Hole eine Liste der Images - images = client.getImageList(); + images = client.getImageListPermissionWrite(person.verantwortlicher.getUserID()); Iterator<server.generated.Image> i = images.iterator(); diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java index f295a1c4..b4e39134 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"); diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java index 97128318..3a5e6ccf 100644 --- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java @@ -894,7 +894,7 @@ public class SearchImage_GUI extends JFrame { List<server.generated.Image> images;
try {
// Hole eine Liste der Images
- images = client.getImageList();
+ images = client.getImageListPermissionRead(person.verantwortlicher.getUserID());
Iterator<server.generated.Image> i = images.iterator();
SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java index 5205c41c..3f1e5dfa 100644 --- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java @@ -949,7 +949,7 @@ public class CreateLectureLink_GUI extends JFrame { List<server.generated.Image> images; // Hole eine Liste der Images - images = client.getImageList(); + images = client.getImageListPermissionLink(person.verantwortlicher.getUserID()); Iterator<server.generated.Image> i = images.iterator(); SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java index dbacf997..ce2130ad 100644 --- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java @@ -954,7 +954,7 @@ public class EditLectureLink_GUI extends JFrame { List<server.generated.Image> images; // Hole eine Liste der Images - images = client.getImageList(); + images = client.getImageListPermissionLink(person.verantwortlicher.getUserID()); Iterator<server.generated.Image> i = images.iterator(); SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); |