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 b8f859d [OPENMEETINGS-1865] calendar is updated to work with new API
b8f859d is described below
commit b8f859d9756da6717989e822cef2433f69d39135
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Mon May 21 20:19:53 2018 +0700
[OPENMEETINGS-1865] calendar is updated to work with new API
---
.../web/user/calendar/CalendarPanel.java | 23 +++++++++++++++-------
.../web/user/calendar/OmCalendarEvent.java | 2 +-
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
index f26a15a..ecdb536 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
@@ -31,6 +31,7 @@ import java.util.List;
import java.util.Optional;
import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.lang3.StringUtils;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.user.UserDao;
@@ -183,17 +184,22 @@ public class CalendarPanel extends UserBasePanel {
}
@Override
- public void onEventClick(AjaxRequestTarget target,
CalendarView view, int eventId) {
- Appointment a = apptDao.get((long)eventId);
+ public void onEventClick(AjaxRequestTarget target,
CalendarView view, String eventId) {
+ if (!StringUtils.isNumeric(eventId)) {
+ return;
+ }
+ Appointment a =
apptDao.get(Long.valueOf(eventId));
dialog.setModelObjectWithAjaxTarget(a, target);
dialog.open(target);
}
@Override
- public void onEventDrop(AjaxRequestTarget target, int
eventId, long delta, boolean allDay) {
- Appointment a = apptDao.get((long)eventId);
-
+ public void onEventDrop(AjaxRequestTarget target,
String eventId, long delta, boolean allDay) {
+ if (!StringUtils.isNumeric(eventId)) {
+ return;
+ }
+ Appointment a =
apptDao.get(Long.valueOf(eventId));
if (!AppointmentDialog.isOwner(a)) {
return;
}
@@ -214,8 +220,11 @@ public class CalendarPanel extends UserBasePanel {
}
@Override
- public void onEventResize(AjaxRequestTarget target, int
eventId, long delta) {
- Appointment a = apptDao.get((long)eventId);
+ public void onEventResize(AjaxRequestTarget target,
String eventId, long delta) {
+ if (!StringUtils.isNumeric(eventId)) {
+ return;
+ }
+ Appointment a =
apptDao.get(Long.valueOf(eventId));
if (!AppointmentDialog.isOwner(a)) {
return;
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/OmCalendarEvent.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/OmCalendarEvent.java
index 6665be1..1e8e98e 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/OmCalendarEvent.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/OmCalendarEvent.java
@@ -28,7 +28,7 @@ public class OmCalendarEvent extends CalendarEvent {
private static final long serialVersionUID = 1L;
public OmCalendarEvent(Appointment a) {
- super(a.getId().intValue(), a.getTitle(), null);
+ super(String.valueOf(a.getId()), a.getTitle(), null);
setStart(getDateTime(a.getStart()));
setEnd(getDateTime(a.getEnd()));
setEditable(AppointmentDialog.isOwner(a));
--
To stop receiving notification emails like this one, please contact
[email protected].
