[Bedework-commit] webapps r392 - in trunk: webclient/war/docs/event webcommon/src/org/bedework/webcommon/event

[svnadmin at bedework.org]

Author: douglm
Date: 2007-06-04 15:20:05 -0400 (Mon, 04 Jun 2007)
New Revision: 392

Modified:
   trunk/webclient/war/docs/event/attendees.jsp
   trunk/webcommon/src/org/bedework/webcommon/event/AttendeeAction.java
   trunk/webcommon/src/org/bedework/webcommon/event/FetchEventAction.java
   trunk/webcommon/src/org/bedework/webcommon/event/InitAddEventAction.java
Log:
Fix some bugs with freebusy

Modified: trunk/webclient/war/docs/event/attendees.jsp
===================================================================
--- trunk/webclient/war/docs/event/attendees.jsp	2007-06-03 05:03:23 UTC (rev 391)
+++ trunk/webclient/war/docs/event/attendees.jsp	2007-06-04 19:20:05 UTC (rev 392)
@@ -35,7 +35,7 @@
 </attendees>
 
 <freebusy>
-  <logic:present name="cakForm" property="formattedFreeBusy" >
+  <logic:present name="calForm" property="formattedFreeBusy" >
     <bean:define id="freeBusyObj" name="calForm" property="formattedFreeBusy" />
     <bw:emitText name="freeBusyObj" property="account" tagName="who" />
     <bw:emitText name="freeBusyObj" property="start.dtval" tagName="start" />

Modified: trunk/webcommon/src/org/bedework/webcommon/event/AttendeeAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/event/AttendeeAction.java	2007-06-03 05:03:23 UTC (rev 391)
+++ trunk/webcommon/src/org/bedework/webcommon/event/AttendeeAction.java	2007-06-04 19:20:05 UTC (rev 392)
@@ -34,7 +34,6 @@
 import org.bedework.calfacade.BwEventObj;
 import org.bedework.calfacade.CalFacadeDefs;
 import org.bedework.calfacade.ScheduleResult;
-import org.bedework.calfacade.base.AttendeesEntity;
 import org.bedework.calfacade.timezones.CalTimezones;
 import org.bedework.calfacade.util.CalFacadeUtil;
 import org.bedework.calsvci.CalSvcI;
@@ -86,6 +85,10 @@
     CalSvcI svc = form.fetchSvci();
 
     Attendees atts = form.getAttendees();
+    if (atts == null) {
+      atts = new Attendees();
+      form.setAttendees(new Attendees());
+    }
 
     if (!form.getAddingEvent()) {
       BwEvent ev = form.getEvent();

Modified: trunk/webcommon/src/org/bedework/webcommon/event/FetchEventAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/event/FetchEventAction.java	2007-06-03 05:03:23 UTC (rev 391)
+++ trunk/webcommon/src/org/bedework/webcommon/event/FetchEventAction.java	2007-06-04 19:20:05 UTC (rev 392)
@@ -56,6 +56,7 @@
 
 import org.bedework.calfacade.RecurringRetrievalMode.Rmode;
 import org.bedework.calfacade.svc.EventInfo;
+import org.bedework.webcommon.Attendees;
 import org.bedework.webcommon.BwAbstractAction;
 import org.bedework.webcommon.BwActionFormBase;
 import org.bedework.webcommon.BwRequest;
@@ -91,6 +92,9 @@
     EventInfo einf = findEvent(request, form, mode);
 
     int fwd = refreshEvent(einf, request, form);
+    form.setAttendees(new Attendees());
+    form.setFbResponses(null);
+    form.setFormattedFreeBusy(null);
     if (fwd == forwardContinue) {
       if (request.hasCopy()) {
         copyEvent(einf.getEvent(), form);

Modified: trunk/webcommon/src/org/bedework/webcommon/event/InitAddEventAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/event/InitAddEventAction.java	2007-06-03 05:03:23 UTC (rev 391)
+++ trunk/webcommon/src/org/bedework/webcommon/event/InitAddEventAction.java	2007-06-04 19:20:05 UTC (rev 392)
@@ -63,6 +63,8 @@
     BwEvent ev = form.getEvent();
     form.assignAddingEvent(true);
     form.setAttendees(new Attendees());
+    form.setFbResponses(null);
+    form.setFormattedFreeBusy(null);
 
     Schedule sched = request.getSchedule();