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/lecture/EditLectureLink_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/lecture/EditLectureLink_GUI.java')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java | 2 |
1 files changed, 1 insertions, 1 deletions
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"); |