You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2018/05/21 13:20:13 UTC
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1865] calendar
is updated to work with new API
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new e83aba0 [OPENMEETINGS-1865] calendar is updated to work with new API
e83aba0 is described below
commit e83aba0d597b17c710e6abcdd85b2476f8319e2f
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Mon May 21 20:19:53 2018 +0700
[OPENMEETINGS-1865] calendar is updated to work with new API
---
.../web/user/calendar/CalendarPanel.java | 22 ++++++++++++++++------
.../web/user/calendar/OmCalendarEvent.java | 2 +-
2 files changed, 17 insertions(+), 7 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 731ded0..84ab534 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
@@ -33,6 +33,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.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
@@ -175,17 +176,23 @@ public class CalendarPanel extends UserBasePanel {
}
@Override
- public void onEventClick(AjaxRequestTarget target, CalendarView view, int eventId) {
- Appointment a = getDao().get((long)eventId);
+ public void onEventClick(AjaxRequestTarget target, CalendarView view, String eventId) {
+ if (!StringUtils.isNumeric(eventId)) {
+ return;
+ }
+ Appointment a = getDao().get(Long.valueOf(eventId));
dialog.setModelObjectWithAjaxTarget(a, target);
dialog.open(target);
}
@Override
- public void onEventDrop(AjaxRequestTarget target, int eventId, long delta, boolean allDay) {
+ public void onEventDrop(AjaxRequestTarget target, String eventId, long delta, boolean allDay) {
+ if (!StringUtils.isNumeric(eventId)) {
+ return;
+ }
AppointmentDao dao = getDao();
- Appointment a = dao.get((long)eventId);
+ Appointment a = dao.get(Long.valueOf(eventId));
if (!AppointmentDialog.isOwner(a)) {
return;
@@ -207,9 +214,12 @@ public class CalendarPanel extends UserBasePanel {
}
@Override
- public void onEventResize(AjaxRequestTarget target, int eventId, long delta) {
+ public void onEventResize(AjaxRequestTarget target, String eventId, long delta) {
+ if (!StringUtils.isNumeric(eventId)) {
+ return;
+ }
AppointmentDao dao = getDao();
- Appointment a = dao.get((long)eventId);
+ Appointment a = dao.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
solomax@apache.org.