Author: vdegtyarev Date: Fri May 17 09:02:48 2013 New Revision: 1483701 URL: http://svn.apache.org/r1483701 Log: OPENMEETINGS-633 additional check in.
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html?rev=1483701&r1=1483700&r2=1483701&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html (original) +++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html Fri May 17 09:02:48 2013 @@ -21,6 +21,7 @@ <html xmlns:wicket="http://wicket.apache.org"> <wicket:panel> <form wicket:id="appForm"> + <span wicket:id="feedback"></span> <table> <tr> <td><wicket:ommessage key="572" /></td> 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=1483701&r1=1483700&r2=1483701&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 Fri May 17 09:02:48 2013 @@ -48,8 +48,10 @@ import org.apache.wicket.markup.html.for import org.apache.wicket.markup.html.form.RequiredTextField; import org.apache.wicket.markup.html.form.TextArea; import org.apache.wicket.markup.html.form.TextField; +import org.apache.wicket.markup.html.panel.FeedbackPanel; import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.model.IModel; +import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog; @@ -62,6 +64,7 @@ public class AppointmentDialog extends A private DialogButton cancel = new DialogButton(WebSession.getString(1130)); private DialogButton delete = new DialogButton(WebSession.getString(814)); private final CalendarPanel calendar; + protected final FeedbackPanel feedback; @Override public void setModelObject(Appointment object) { @@ -72,6 +75,8 @@ public class AppointmentDialog extends A public AppointmentDialog(String id, String title, CalendarPanel calendar, IModel<Appointment> model) { super(id, title, model, true); this.calendar = calendar; + setOutputMarkupId(true); + feedback = new FeedbackPanel("feedback"); form = new AppointmentForm("appForm", new CompoundPropertyModel<Appointment>(this.getModel())); add(form); } @@ -106,13 +111,13 @@ public class AppointmentDialog extends A @Override protected void onError(AjaxRequestTarget target) { - // FIXME feedback + target.add(feedback); } @Override protected void onSubmit(AjaxRequestTarget target) { getBean(AppointmentDao.class).update(form.getModelObject(), getUserId()); - // FIXME feedback + target.add(feedback); calendar.refresh(target); } @@ -157,7 +162,8 @@ public class AppointmentDialog extends A super(id, model); setOutputMarkupId(true); - add(new RequiredTextField<String>("appointmentName")); + add(feedback.setOutputMarkupId(true)); + add(new RequiredTextField<String>("appointmentName").setLabel(Model.of(WebSession.getString(572)))); add(new TextArea<String>("appointmentDescription")); add(new TextField<String>("appointmentLocation")); add(new DateTimeField("appointmentStarttime"));