You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2013/07/21 07:14:22 UTC
svn commit: r1505273 - in
/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar:
AppointmentDialog.java CalendarPanel.java
Author: sebawagner
Date: Sun Jul 21 05:14:22 2013
New Revision: 1505273
URL: http://svn.apache.org/r1505273
Log:
Fixes OPENMEETINGS-709 - Create Appointment Popup does not show delete button if its a new Appointment
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1505273&r1=1505272&r2=1505273&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java Sun Jul 21 05:14:22 2013
@@ -85,9 +85,15 @@ public class AppointmentDialog extends A
return 650;
}
- @Override
- public void setModelObject(Appointment object) {
+ //@Override
+ public void setModelObjectWithAjaxTarget(Appointment object, AjaxRequestTarget target) {
form.setModelObject(object);
+ log.debug(" -- setModelObjectWithAjaxTarget -- Current model " + object);
+ if (object.getAppointmentId() != null) {
+ delete.setVisible(true, target);
+ } else {
+ delete.setVisible(false, target);
+ }
super.setModelObject(object);
}
@@ -105,11 +111,6 @@ public class AppointmentDialog extends A
@Override
protected List<DialogButton> getButtons() {
- log.debug(" -- getButtons -- Current model " + getModel().getObject());
- if (getModel().getObject().getAppointmentId() != null) {
- //TODO: This code does not work
- return Arrays.asList(save, delete, cancel);
- }
return Arrays.asList(save, delete, cancel);
}
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1505273&r1=1505272&r2=1505273&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java Sun Jul 21 05:14:22 2013
@@ -164,7 +164,7 @@ public class CalendarPanel extends UserP
a.setAppointmentStarttime(start);
a.setAppointmentEndtime(end);
}
- dialog.setModelObject(a);
+ dialog.setModelObjectWithAjaxTarget(a, target);
dialog.open(target);
}
@@ -172,7 +172,7 @@ public class CalendarPanel extends UserP
@Override
public void onEventClick(AjaxRequestTarget target, CalendarView view, int eventId) {
Appointment a = getDao().getAppointmentById((long)eventId);
- dialog.setModelObject(a);
+ dialog.setModelObjectWithAjaxTarget(a, target);
dialog.open(target);