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 2013/08/07 18:33:57 UTC
svn commit: r1511383 -
/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
Author: solomax
Date: Wed Aug 7 16:33:57 2013
New Revision: 1511383
URL: http://svn.apache.org/r1511383
Log:
[OPENMEETINGS-726] guest events are not editable
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.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=1511383&r1=1511382&r2=1511383&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 Wed Aug 7 16:33:57 2013
@@ -93,6 +93,7 @@ public class AppointmentDialog extends A
//@Override
public void setModelObjectWithAjaxTarget(Appointment object, AjaxRequestTarget target) {
form.setModelObject(object);
+ form.setEnabled(object.getUserId() == null || getUserId() == object.getUserId().getUser_id());
log.debug(" -- setModelObjectWithAjaxTarget -- Current model " + object);
if (object.getAppointmentId() != null) {
delete.setVisible(true, target);
@@ -115,13 +116,11 @@ public class AppointmentDialog extends A
confirmDelete = new MessageDialog("confirmDelete", WebSession.getString(814), WebSession.getString(833), DialogButtons.OK_CANCEL, DialogIcon.WARN){
private static final long serialVersionUID = 1L;
- public void onClose(AjaxRequestTarget target, DialogButton button)
- {
+ public void onClose(AjaxRequestTarget target, DialogButton button) {
if (button.equals(DialogButtons.OK)){
deleteAppointment(target);
}
}
-
};
add(confirmDelete);
}
@@ -179,7 +178,6 @@ public class AppointmentDialog extends A
super.onModelChanged();
Appointment a = getModelObject();
-
List<AppointmentReminderTyps> remindTypes = getRemindTypes();
if (a.getRemind() == null && !remindTypes.isEmpty()) {
a.setRemind(remindTypes.get(0));