This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push: new 95bd4df [OPENMEETINGS-2543] OmCalendar should save as expected 95bd4df is described below commit 95bd4dfee608784974be0861300bdb2d433eb891 Author: Maxim Solodovnik <solomax...@gmail.com> AuthorDate: Wed Dec 30 17:41:00 2020 +0700 [OPENMEETINGS-2543] OmCalendar should save as expected --- .../org/apache/openmeetings/web/user/calendar/CalendarDialog.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java index 5356be1..f0fe695 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java @@ -27,6 +27,7 @@ import org.apache.http.auth.UsernamePasswordCredentials; import org.apache.http.client.HttpClient; import org.apache.http.client.protocol.HttpClientContext; import org.apache.openmeetings.db.dao.calendar.AppointmentDao; +import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.calendar.Appointment; import org.apache.openmeetings.db.entity.calendar.OmCalendar; import org.apache.openmeetings.service.calendar.caldav.AppointmentManager; @@ -74,6 +75,8 @@ public class CalendarDialog extends Modal<OmCalendar> { private List<OmCalendar> cals; //List of calendars for syncing private int calIndex = 0; @SpringBean + private UserDao userDao; + @SpringBean private AppointmentDao apptDao; @SpringBean private AppointmentManager apptManager; @@ -110,6 +113,7 @@ public class CalendarDialog extends Modal<OmCalendar> { case UPDATE_CALENDAR: OmCalendar c = form.getModelObject(); c.setHref(form.url.getModelObject()); + c.setOwner(userDao.get(c.getOwner().getId())); // owner might need to be refreshed HttpClient client = calendarPanel.getHttpClient(); HttpClientContext context = calendarPanel.getHttpClientContext();