diff options
| author | Jonathan Bauer | 2015-08-28 15:52:23 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2015-08-28 15:52:23 +0200 |
| commit | f0f84d58ec99fc73217c44eca993d2a1a9abed01 (patch) | |
| tree | 34e81043634aa4892101e851fff7af337e3334c3 /dozentenmodul | |
| parent | [client] merged the session initializing stuff in ThriftActions.initSession (diff) | |
| parent | [client] Implemented changing of used imageversion in lecture details. (diff) | |
| download | tutor-module-f0f84d58ec99fc73217c44eca993d2a1a9abed01.tar.gz tutor-module-f0f84d58ec99fc73217c44eca993d2a1a9abed01.tar.xz tutor-module-f0f84d58ec99fc73217c44eca993d2a1a9abed01.zip | |
Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1
Diffstat (limited to 'dozentenmodul')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java index 9c96816c..90a15b45 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java @@ -273,6 +273,7 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements listenToChange(); makeEditable(true); + setVisible(true); } @@ -350,6 +351,9 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements */ private void saveChanges() { + // check, whether autoupdate is selected and choose version accordingly + lecture.imageVersionId = btnAutoUpdate.isSelected() ? image.latestVersionId : cboVersions.getItemAt(cboVersions.getSelectedIndex()).versionId; + // date valid TODO sat max time if (!isPeriodValid(DateTimeHelper.getDateFrom(startDate, startTime), DateTimeHelper.getDateFrom(endDate, endTime), true)) { @@ -518,9 +522,9 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements cboVersions.setEnabled(editable && !lecture.autoUpdate); btnChangeOwner.setEnabled(editable && LecturePerms.canAdmin(lecture)); btnPermissions.setEnabled(editable && LecturePerms.canAdmin(lecture)); - startDate.setEnabled(editable); // TODO + startDate.setEnabled(editable); startTime.setEnabled(editable); - endDate.setEnabled(editable); // TODO + endDate.setEnabled(editable); endTime.setEnabled(editable); } |